Added computable elements. Refactored models and packages.