Renamed a few classes, moved others into common lib.
Composer bump.