Fixed merge build issues and moved domain objects to the Rackspace NS