Restructure

Restructured the directory structure of project.