Replacing Rectangle.swift with Rect.swift
Renaming Shape Classes