Compile Fix Round 1
Restructure + Added MaintenanceWorker