Code restructuring started