Reworking adminModul files

Cleanup, reorder