Project Restructuring

Restructured the project.