Moved the builder classes into a builder package.