Revert "Re-structured folders"

This reverts commit 6b5c52afdf29b1660e68e7267d7d2d69c5354165.