Rearranging the project

Changing the project directory tree