diff --git a/controllers/AuthController.go b/controllers/auth_controller.go
similarity index 100%
rename from controllers/AuthController.go
rename to controllers/auth_controller.go
diff --git a/controllers/DevicesController.go b/controllers/devices_controller.go
similarity index 100%
rename from controllers/DevicesController.go
rename to controllers/devices_controller.go
diff --git a/controllers/DevicesController_test.go b/controllers/devices_controller_test.go
similarity index 98%
rename from controllers/DevicesController_test.go
rename to controllers/devices_controller_test.go
index a3fde9d..3587e95 100644
--- a/controllers/DevicesController_test.go
+++ b/controllers/devices_controller_test.go
@@ -36,6 +36,7 @@ func runTestServer() *httptest.Server {
 func TestSaveDeviceInfofunc(t *testing.T) {
 	ts := runTestServer()
 	defer ts.Close()
+	defer shared.CloseDb()
 
 	t.Run("it should return 400 when JSON payload is invalid", func(t *testing.T) {
 		payload := []byte(`{"InvalidPayload": `)
diff --git a/controllers/SampleController.go b/controllers/simple_controller.go
similarity index 100%
rename from controllers/SampleController.go
rename to controllers/simple_controller.go
diff --git a/routes/protectedRoutes.go b/routes/protected_routes.go
similarity index 100%
rename from routes/protectedRoutes.go
rename to routes/protected_routes.go
diff --git a/routes/publicRoutes.go b/routes/public_routes.go
similarity index 100%
rename from routes/publicRoutes.go
rename to routes/public_routes.go
diff --git a/routes/utilityRoutes.go b/routes/utility_routes.go
similarity index 100%
rename from routes/utilityRoutes.go
rename to routes/utility_routes.go
diff --git a/shared/userData.go b/shared/user_data.go
similarity index 100%
rename from shared/userData.go
rename to shared/user_data.go