Updating references, moving classes around packages and generally
messing things up more while pretending to help.