Changed the structure of project again