Dir restructure

Restructured the project's directory structure.