Merge branch 'hotfix/0.0.4-4'
Changed the file structure around