Revert "Rearranged file structure"

This reverts commit 8aa29c17e80feb78893290b81648839acf20650b.
Revert "Revert "Rearranged file structure""

This reverts commit 1b2c3de8fdc456a19d46e6022c5eef7ac053d21d.