ReStructuring the architecture of the project