Project Cleanup

Cleaned up the project structure.