Undoing some package reorganization.