Revert "Changed file structure"

This reverts commit 3c3df279719ba5a44cbd81dbe72f830635bc4e9a.