diff --git a/acls.go b/hscontrol/acls.go
similarity index 100%
rename from acls.go
rename to hscontrol/acls.go
diff --git a/acls_test.go b/hscontrol/acls_test.go
similarity index 100%
rename from acls_test.go
rename to hscontrol/acls_test.go
diff --git a/acls_types.go b/hscontrol/acls_types.go
similarity index 100%
rename from acls_types.go
rename to hscontrol/acls_types.go
diff --git a/api.go b/hscontrol/api.go
similarity index 100%
rename from api.go
rename to hscontrol/api.go
diff --git a/api_common.go b/hscontrol/api_common.go
similarity index 100%
rename from api_common.go
rename to hscontrol/api_common.go
diff --git a/api_key.go b/hscontrol/api_key.go
similarity index 100%
rename from api_key.go
rename to hscontrol/api_key.go
diff --git a/api_key_test.go b/hscontrol/api_key_test.go
similarity index 100%
rename from api_key_test.go
rename to hscontrol/api_key_test.go
diff --git a/app.go b/hscontrol/app.go
similarity index 100%
rename from app.go
rename to hscontrol/app.go
diff --git a/app_test.go b/hscontrol/app_test.go
similarity index 100%
rename from app_test.go
rename to hscontrol/app_test.go
diff --git a/config.go b/hscontrol/config.go
similarity index 100%
rename from config.go
rename to hscontrol/config.go
diff --git a/db.go b/hscontrol/db.go
similarity index 100%
rename from db.go
rename to hscontrol/db.go
diff --git a/derp.go b/hscontrol/derp.go
similarity index 100%
rename from derp.go
rename to hscontrol/derp.go
diff --git a/derp_server.go b/hscontrol/derp_server.go
similarity index 100%
rename from derp_server.go
rename to hscontrol/derp_server.go
diff --git a/dns.go b/hscontrol/dns.go
similarity index 100%
rename from dns.go
rename to hscontrol/dns.go
diff --git a/dns_test.go b/hscontrol/dns_test.go
similarity index 100%
rename from dns_test.go
rename to hscontrol/dns_test.go
diff --git a/grpcv1.go b/hscontrol/grpcv1.go
similarity index 100%
rename from grpcv1.go
rename to hscontrol/grpcv1.go
diff --git a/grpcv1_test.go b/hscontrol/grpcv1_test.go
similarity index 100%
rename from grpcv1_test.go
rename to hscontrol/grpcv1_test.go
diff --git a/handler_legacy.go b/hscontrol/handler_legacy.go
similarity index 100%
rename from handler_legacy.go
rename to hscontrol/handler_legacy.go
diff --git a/handler_placeholder.go b/hscontrol/handler_placeholder.go
similarity index 100%
rename from handler_placeholder.go
rename to hscontrol/handler_placeholder.go
diff --git a/integration_cli_test.go b/hscontrol/integration_cli_test.go
similarity index 100%
rename from integration_cli_test.go
rename to hscontrol/integration_cli_test.go
diff --git a/integration_common_test.go b/hscontrol/integration_common_test.go
similarity index 100%
rename from integration_common_test.go
rename to hscontrol/integration_common_test.go
diff --git a/machine.go b/hscontrol/machine.go
similarity index 100%
rename from machine.go
rename to hscontrol/machine.go
diff --git a/machine_test.go b/hscontrol/machine_test.go
similarity index 100%
rename from machine_test.go
rename to hscontrol/machine_test.go
diff --git a/matcher.go b/hscontrol/matcher.go
similarity index 100%
rename from matcher.go
rename to hscontrol/matcher.go
diff --git a/matcher_test.go b/hscontrol/matcher_test.go
similarity index 100%
rename from matcher_test.go
rename to hscontrol/matcher_test.go
diff --git a/metrics.go b/hscontrol/metrics.go
similarity index 100%
rename from metrics.go
rename to hscontrol/metrics.go
diff --git a/noise.go b/hscontrol/noise.go
similarity index 100%
rename from noise.go
rename to hscontrol/noise.go
diff --git a/oidc.go b/hscontrol/oidc.go
similarity index 100%
rename from oidc.go
rename to hscontrol/oidc.go
diff --git a/platform_config.go b/hscontrol/platform_config.go
similarity index 100%
rename from platform_config.go
rename to hscontrol/platform_config.go
diff --git a/preauth_keys.go b/hscontrol/preauth_keys.go
similarity index 100%
rename from preauth_keys.go
rename to hscontrol/preauth_keys.go
diff --git a/preauth_keys_test.go b/hscontrol/preauth_keys_test.go
similarity index 100%
rename from preauth_keys_test.go
rename to hscontrol/preauth_keys_test.go
diff --git a/protocol_common.go b/hscontrol/protocol_common.go
similarity index 100%
rename from protocol_common.go
rename to hscontrol/protocol_common.go
diff --git a/protocol_common_poll.go b/hscontrol/protocol_common_poll.go
similarity index 100%
rename from protocol_common_poll.go
rename to hscontrol/protocol_common_poll.go
diff --git a/protocol_common_utils.go b/hscontrol/protocol_common_utils.go
similarity index 100%
rename from protocol_common_utils.go
rename to hscontrol/protocol_common_utils.go
diff --git a/protocol_legacy.go b/hscontrol/protocol_legacy.go
similarity index 100%
rename from protocol_legacy.go
rename to hscontrol/protocol_legacy.go
diff --git a/protocol_legacy_poll.go b/hscontrol/protocol_legacy_poll.go
similarity index 100%
rename from protocol_legacy_poll.go
rename to hscontrol/protocol_legacy_poll.go
diff --git a/protocol_noise.go b/hscontrol/protocol_noise.go
similarity index 100%
rename from protocol_noise.go
rename to hscontrol/protocol_noise.go
diff --git a/protocol_noise_poll.go b/hscontrol/protocol_noise_poll.go
similarity index 100%
rename from protocol_noise_poll.go
rename to hscontrol/protocol_noise_poll.go
diff --git a/routes.go b/hscontrol/routes.go
similarity index 100%
rename from routes.go
rename to hscontrol/routes.go
diff --git a/routes_test.go b/hscontrol/routes_test.go
similarity index 100%
rename from routes_test.go
rename to hscontrol/routes_test.go
diff --git a/swagger.go b/hscontrol/swagger.go
similarity index 100%
rename from swagger.go
rename to hscontrol/swagger.go
diff --git a/users.go b/hscontrol/users.go
similarity index 100%
rename from users.go
rename to hscontrol/users.go
diff --git a/users_test.go b/hscontrol/users_test.go
similarity index 100%
rename from users_test.go
rename to hscontrol/users_test.go
diff --git a/utils.go b/hscontrol/utils.go
similarity index 100%
rename from utils.go
rename to hscontrol/utils.go
diff --git a/utils_test.go b/hscontrol/utils_test.go
similarity index 100%
rename from utils_test.go
rename to hscontrol/utils_test.go