Cleaning up

Cleaned the project space a bit so there is less clutter.