fixed project structure
fixed project structure
Merge pull request #1 from artri/master

Fixes to project structure