Revert "Amended file structure"

This reverts commit 635033a0f1491fea6d4e968d86035bef157ebd55.