New structure of project
Change classes