Revert "Files refactor"
Merge pull request #5 from noqsi/revert-4-files-refactor

Revert "Files refactor"