Merge branch 'hotfix/0.1.4'
Bump version
Use correct directory structure
Merge branch 'hotfix/0.1.5' into develop