Revert "Revert "Revert "Revert "Re-structured folders""""

This reverts commit 5da67bfc7d37c4d9b655cbc5f7a646fd0340689d.