diff --git a/api/sys.go b/api/sys.go
index d8ab08dc43..5fb111887c 100644
--- a/api/sys.go
+++ b/api/sys.go
@@ -1,9 +1,5 @@
 package api
 
-import (
-	"fmt"
-)
-
 // Sys is used to perform system-related operations on Vault.
 type Sys struct {
 	c *Client
@@ -13,106 +9,3 @@ type Sys struct {
 func (c *Client) Sys() *Sys {
 	return &Sys{c: c}
 }
-
-func (c *Sys) SealStatus() (*SealStatusResponse, error) {
-	r := c.c.NewRequest("GET", "/sys/seal-status")
-	resp, err := c.c.RawRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var result SealStatusResponse
-	err = resp.DecodeJSON(&result)
-	return &result, err
-}
-
-func (c *Sys) Seal() error {
-	r := c.c.NewRequest("PUT", "/sys/seal")
-	resp, err := c.c.RawRequest(r)
-	defer resp.Body.Close()
-	return err
-}
-
-func (c *Sys) Unseal(shard string) (*SealStatusResponse, error) {
-	body := map[string]interface{}{"key": shard}
-
-	r := c.c.NewRequest("PUT", "/sys/unseal")
-	if err := r.SetJSONBody(body); err != nil {
-		return nil, err
-	}
-
-	resp, err := c.c.RawRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var result SealStatusResponse
-	err = resp.DecodeJSON(&result)
-	return &result, err
-}
-
-func (c *Sys) ListAuth() ([]*AuthResponse, error) {
-	r := c.c.NewRequest("GET", "/sys/auth")
-	resp, err := c.c.RawRequest(r)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	var result []*AuthResponse
-	err = resp.DecodeJSON(&result)
-	return result, err
-}
-
-func (c *Sys) EnableAuth(id string, opts *AuthRequest) error {
-	body := make(map[string]string)
-	for k, v := range opts.Config {
-		body[k] = v
-	}
-	body["type"] = opts.Type
-
-	r := c.c.NewRequest("PUT", fmt.Sprintf("/sys/auth/%s", id))
-	if err := r.SetJSONBody(body); err != nil {
-		return err
-	}
-
-	resp, err := c.c.RawRequest(r)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	return nil
-}
-
-func (c *Sys) DisableAuth(id string) error {
-	r := c.c.NewRequest("DELETE", fmt.Sprintf("/sys/auth/%s", id))
-	resp, err := c.c.RawRequest(r)
-	defer resp.Body.Close()
-	return err
-}
-
-// Structures for the requests/resposne are all down here. They aren't
-// individually documentd because the map almost directly to the raw HTTP API
-// documentation. Please refer to that documentation for more details.
-
-type AuthRequest struct {
-	Type   string
-	Config map[string]string
-}
-
-type AuthResponse struct {
-	ID   string
-	Type string
-	Help string
-	Keys []string
-}
-
-type SealStatusResponse struct {
-	Sealed   bool
-	T        int
-	N        int
-	Progress int
-}
diff --git a/api/sys_auth.go b/api/sys_auth.go
new file mode 100644
index 0000000000..4a109f2b67
--- /dev/null
+++ b/api/sys_auth.go
@@ -0,0 +1,62 @@
+package api
+
+import (
+	"fmt"
+)
+
+func (c *Sys) ListAuth() ([]*AuthResponse, error) {
+	r := c.c.NewRequest("GET", "/sys/auth")
+	resp, err := c.c.RawRequest(r)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var result []*AuthResponse
+	err = resp.DecodeJSON(&result)
+	return result, err
+}
+
+func (c *Sys) EnableAuth(id string, opts *AuthRequest) error {
+	body := make(map[string]string)
+	for k, v := range opts.Config {
+		body[k] = v
+	}
+	body["type"] = opts.Type
+
+	r := c.c.NewRequest("PUT", fmt.Sprintf("/sys/auth/%s", id))
+	if err := r.SetJSONBody(body); err != nil {
+		return err
+	}
+
+	resp, err := c.c.RawRequest(r)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	return nil
+}
+
+func (c *Sys) DisableAuth(id string) error {
+	r := c.c.NewRequest("DELETE", fmt.Sprintf("/sys/auth/%s", id))
+	resp, err := c.c.RawRequest(r)
+	defer resp.Body.Close()
+	return err
+}
+
+// Structures for the requests/resposne are all down here. They aren't
+// individually documentd because the map almost directly to the raw HTTP API
+// documentation. Please refer to that documentation for more details.
+
+type AuthRequest struct {
+	Type   string
+	Config map[string]string
+}
+
+type AuthResponse struct {
+	ID   string
+	Type string
+	Help string
+	Keys []string
+}
diff --git a/api/sys_seal.go b/api/sys_seal.go
new file mode 100644
index 0000000000..d0b50f2efa
--- /dev/null
+++ b/api/sys_seal.go
@@ -0,0 +1,47 @@
+package api
+
+func (c *Sys) SealStatus() (*SealStatusResponse, error) {
+	r := c.c.NewRequest("GET", "/sys/seal-status")
+	resp, err := c.c.RawRequest(r)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var result SealStatusResponse
+	err = resp.DecodeJSON(&result)
+	return &result, err
+}
+
+func (c *Sys) Seal() error {
+	r := c.c.NewRequest("PUT", "/sys/seal")
+	resp, err := c.c.RawRequest(r)
+	defer resp.Body.Close()
+	return err
+}
+
+func (c *Sys) Unseal(shard string) (*SealStatusResponse, error) {
+	body := map[string]interface{}{"key": shard}
+
+	r := c.c.NewRequest("PUT", "/sys/unseal")
+	if err := r.SetJSONBody(body); err != nil {
+		return nil, err
+	}
+
+	resp, err := c.c.RawRequest(r)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var result SealStatusResponse
+	err = resp.DecodeJSON(&result)
+	return &result, err
+}
+
+type SealStatusResponse struct {
+	Sealed   bool
+	T        int
+	N        int
+	Progress int
+}