refactoring all includes and references to packages DaoProject and ControllerProject