Revert "Clean up the file structure"
Merge pull request #4 from kikilin90/revert-2-george/clean-up

Revert "Clean up the file structure"