Moved domain classes around and updated namespaces