Revert "Just moving folders to their correct location"

This reverts commit f3c76e9023e20a883375270bc33d9119363b2d68.
Revert "Revert "Just moving folders to their correct location""

This reverts commit 72d40dd17c8494f4c50913a68e24ffd0ce0b75c6.