Revert "Rearranging the project"

This reverts commit da33b8c700f0b8edbdc1c06b5045437d4bf1c05c.
Revert "Revert "Rearranging the project""

This reverts commit 31dbaaddb7d44682fc0cd45616f83e4a93d7b96a.
Rearranging the project *corrected*