Moving things in preparation for a big reorganization.