Project structure updates fixes.
Merge pull request #6 from KKrisu/development

Project structure updates fixes.