(fix) reorganize files
Merge pull request #78 from jonsadka/master

(fix) reorganize files