Reworked structure of our progect
Merge pull request #2 from Gorgonello/reworked_progect_structure

Reworked structure of our progect