Update project's directory structure
Merge pull request #187 from elyezer/master

Update project's directory structure