Changing the structure of the code