[TASK] Begin of model reorganization