Revert "(cleanup) Cleanup/file structure"

Reverts common-badger/yokel#9