- moved the DataModel.js
- enhanced Event system