Changed entire structure of project