Merge pull request #95 from igemsoftware/master

Merge pull request #91 from igemsoftware/Branch-chyb
Optimize folder structure
Merge remote-tracking branch 'origin/master'