refactoring models and new Yupii Class added