Continue refactor changes
Merge pull request #291 from moradology/feature/move-file

Continue refactor changes