Clean up

Cleaning up the main folder