Refactor to re-organize classes according to DDD