updated project structure
Merge pull request #2 from mwolski89/dev

updated project structure