Revert "Revert "Revert "Changed file/folder structure"""

This reverts commit 333c9e64f774aeefb2d2f5b5fd024769b0860264.