Revert "Revert "Re-structured folders""

This reverts commit df6bf7dddbf2ee3721cf01e4c56b557a96006196.