* Moved AlarmDao & ControllerDao to new module
* Refactored ControllerDao not to use MessageManager