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

This reverts commit 0f1fcf0e3b9bbf8ce07129fb71a720175f833089.