Changing the architecture of the code