Reorganized the project

Simplified the layout of the project.