Revert "Revert "Changed file structure""

This reverts commit 571bdc8b858e8a71267dd6ec1bbaa0f45f947fd0.