diff --git a/Makefile b/Makefile
index d708b753e4..44b8328415 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ CGO_ENABLED?=0
 export GEN_BASEPATH := $(shell pwd)
 
 api:
-	$(MAKE) --environment-overrides -C api/internal/genapi api
+	$(MAKE) --environment-overrides -C internal/api/genapi api
 
 tools:
 	go generate -tags tools tools/tools.go
diff --git a/api/internal/tests/detail_template_test.go b/api/internal/tests/detail_template_test.go
deleted file mode 100644
index ace68f64a2..0000000000
--- a/api/internal/tests/detail_template_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package tests
-
-// TODO: Reenable once we reimplement generation of As functions once static hosts lands
-/*
-func TestDetailTemplating(t *testing.T) {
-	lt := time.Now()
-	c := hosts.HostCatalog{
-		Id:          "id",
-		CreatedTime: lt,
-		Attributes: map[string]interface{}{
-			"regions":    []string{"a", "b"},
-			"access_key": "access",
-			"secret_key": "secret",
-			"rotate":     true,
-		},
-	}
-
-	ac, err := c.AsAwsEc2HostCatalog()
-	assert.NoError(t, err)
-	assert.Equal(t, &hosts.AwsEc2HostCatalog{
-		HostCatalog: &c,
-		Regions:     []string{"a", "b"},
-		AccessKey:   api.String("access"),
-		SecretKey:   api.String("secret"),
-		Rotate:      api.Bool(true),
-	}, ac)
-}
-*/
diff --git a/go.mod b/go.mod
index 21e635be1e..a0c4b73991 100644
--- a/go.mod
+++ b/go.mod
@@ -32,6 +32,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0
 	github.com/hashicorp/shared-secure-libs v0.0.2
 	github.com/hashicorp/vault/sdk v0.1.14-0.20200916184745-5576096032f8
+	github.com/iancoleman/strcase v0.1.2
 	github.com/jackc/pgx/v4 v4.9.0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/kr/pretty v0.2.1
diff --git a/api/internal/genapi/Makefile b/internal/api/genapi/Makefile
similarity index 100%
rename from api/internal/genapi/Makefile
rename to internal/api/genapi/Makefile
diff --git a/api/internal/genapi/input.go b/internal/api/genapi/input.go
similarity index 100%
rename from api/internal/genapi/input.go
rename to internal/api/genapi/input.go
diff --git a/api/internal/genapi/main.go b/internal/api/genapi/main.go
similarity index 100%
rename from api/internal/genapi/main.go
rename to internal/api/genapi/main.go
diff --git a/api/internal/genapi/parse.go b/internal/api/genapi/parse.go
similarity index 100%
rename from api/internal/genapi/parse.go
rename to internal/api/genapi/parse.go
diff --git a/api/internal/genapi/templates.go b/internal/api/genapi/templates.go
similarity index 100%
rename from api/internal/genapi/templates.go
rename to internal/api/genapi/templates.go
diff --git a/api/accounts/account_test.go b/internal/tests/api/accounts/account_test.go
similarity index 100%
rename from api/accounts/account_test.go
rename to internal/tests/api/accounts/account_test.go
diff --git a/api/authmethods/authenticate_test.go b/internal/tests/api/authmethods/authenticate_test.go
similarity index 100%
rename from api/authmethods/authenticate_test.go
rename to internal/tests/api/authmethods/authenticate_test.go
diff --git a/api/authtokens/authtoken_test.go b/internal/tests/api/authtokens/authtoken_test.go
similarity index 100%
rename from api/authtokens/authtoken_test.go
rename to internal/tests/api/authtokens/authtoken_test.go
diff --git a/api/client_test.go b/internal/tests/api/client_test.go
similarity index 100%
rename from api/client_test.go
rename to internal/tests/api/client_test.go
diff --git a/api/groups/group_test.go b/internal/tests/api/groups/group_test.go
similarity index 100%
rename from api/groups/group_test.go
rename to internal/tests/api/groups/group_test.go
diff --git a/api/hostcatalogs/host_catalog_test.go b/internal/tests/api/hostcatalogs/host_catalog_test.go
similarity index 100%
rename from api/hostcatalogs/host_catalog_test.go
rename to internal/tests/api/hostcatalogs/host_catalog_test.go
diff --git a/api/hosts/host_test.go b/internal/tests/api/hosts/host_test.go
similarity index 100%
rename from api/hosts/host_test.go
rename to internal/tests/api/hosts/host_test.go
diff --git a/api/hostsets/host_set_test.go b/internal/tests/api/hostsets/host_set_test.go
similarity index 100%
rename from api/hostsets/host_set_test.go
rename to internal/tests/api/hostsets/host_set_test.go
diff --git a/api/roles/role_test.go b/internal/tests/api/roles/role_test.go
similarity index 100%
rename from api/roles/role_test.go
rename to internal/tests/api/roles/role_test.go
diff --git a/api/scopes/scope_test.go b/internal/tests/api/scopes/scope_test.go
similarity index 100%
rename from api/scopes/scope_test.go
rename to internal/tests/api/scopes/scope_test.go
diff --git a/api/targets/target_test.go b/internal/tests/api/targets/target_test.go
similarity index 100%
rename from api/targets/target_test.go
rename to internal/tests/api/targets/target_test.go
diff --git a/api/users/user_test.go b/internal/tests/api/users/user_test.go
similarity index 100%
rename from api/users/user_test.go
rename to internal/tests/api/users/user_test.go