Cleaned out the project structure