move stuff in to DDD subpackages