Move internal classes out.
Fix up the default transformation to not use scaling.

Change-Id: I58a80aaa0ac4b618b8cfd2df44447f5f6ee01f23