Updating: miscellaneous re-organizing.