renaming to relfect packaging
making tweaks to domain classes