Drop Rect, rename Rect2 to Rect

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>