change code organization