Initial restructure for legacy import and shared domain entities