Revert "Project structure re-structured"

This reverts commit 52ae1e45973f383d544a1528c4da617def585511.