refactored from "domain" to "model"
namespace fixed