Reworked structure of our progect