Changing structure of all the code to conform to Quarks structure