New Project structure
Revert "New Project structure"

This reverts commit 6977551bed1de6a9702852454b3c8599777b6850.