Revert "Fixing file structure"

This reverts commit 747ab32e17b7c68d877e548dd4aa0489d4dc560a.