Modified architecture of project.