work on project directory layout

Refactored the project directory