Reorganize & rename.