re-shuffle files
finishes folder-icons
Merge branch 'feature/folder-icons' into develop
bump version
Merge branch 'develop' into release/0.0.4