Fixes #8; retructures project
Merge pull request #10 from mihaineacsu/8-restructure-proj

Fixes #8; retructures project