Cleaned up project structure.
Cleaned up project structure.