Moves modules to front of house
Moves core to front of house
Clean up