Cleaning up a really messy project folder.

Cleaning up a really messy project folder.