Improved project structure
Merge pull request #4 from Muriasen/master

Improved project structure