Moving code around a little.
Update class names.
Renaming output binaries.