Update code organization