update code organization