jdeeco.core.mode - refactoring

refactored model