Fix folder structure
Merge pull request #31 from Kristories/develop

Fix folder structure