Revert "(cleanup) Cleanup/file structure"
Merge pull request #10 from common-badger/revert-9-cleanup/file-structure

Revert "(cleanup) Cleanup/file structure"