diff --git a/src/handlers/admin_handler_health.erl b/src/handlers/admin/admin_handler_health.erl
similarity index 100%
rename from src/handlers/admin_handler_health.erl
rename to src/handlers/admin/admin_handler_health.erl
diff --git a/src/handlers/admin_handler_stats.erl b/src/handlers/admin/admin_handler_stats.erl
similarity index 100%
rename from src/handlers/admin_handler_stats.erl
rename to src/handlers/admin/admin_handler_stats.erl
diff --git a/src/handlers/admin_handler_user_by_id.erl b/src/handlers/admin/admin_handler_user_by_id.erl
similarity index 100%
rename from src/handlers/admin_handler_user_by_id.erl
rename to src/handlers/admin/admin_handler_user_by_id.erl
diff --git a/src/handlers/admin_handler_users.erl b/src/handlers/admin/admin_handler_users.erl
similarity index 100%
rename from src/handlers/admin_handler_users.erl
rename to src/handlers/admin/admin_handler_users.erl
diff --git a/src/handlers/admin_ws_handler.erl b/src/handlers/admin/admin_ws_handler.erl
similarity index 100%
rename from src/handlers/admin_ws_handler.erl
rename to src/handlers/admin/admin_ws_handler.erl
diff --git a/test/unit/core_ticket_tests.erl b/test/unit/core_ticket_tests.erl
index 9d7ed82..8c9df61 100644
--- a/test/unit/core_ticket_tests.erl
+++ b/test/unit/core_ticket_tests.erl
@@ -85,7 +85,7 @@ test_list_all() ->
   ?assertEqual(3, length(Tickets)).
 
 test_list_by_status() ->
-  {ok, T1} = core_ticket:create_or_update(<<"E1">>, <<"">>, #{}),
+  {ok, _T1} = core_ticket:create_or_update(<<"E1">>, <<"">>, #{}),
   {ok, T2} = core_ticket:create_or_update(<<"E2">>, <<"">>, #{}),
 
   core_ticket:update_status(T2#ticket.id, resolved),