Revert "changed project directories"

This reverts commit 0bd8b5c226938d056c56be7e9b6333c446058373.
Revert "Revert "changed project directories""

This reverts commit f891fbebbdefcabfaec2a984c2a7838fa7de9d59.