Updated project structure
Updated project structure, minor refactoring
Merge pull request #9 from jonasevcik/master

Changed project structure