Rename classes, finishing touches to projects