Tom: added sample DDD refactoring