Reorganization of RobotModel