Renames and moves classes to reflect dependencies