Fixing project structure
Merge pull request #2 from Gustav-76/master

asd
Merge pull request #1 from Gustav-76/development

Fixing project structure