Revert "Revert "project's structure""

This reverts commit 29283b6e8c6027163270499dd133f7eccc86faa9.