Changed the structure of project