Structure of teh project refactored