Simplified domain language and prepared repo for builds.