Reorganized the project structure

Rearranged things in the project.