[#86] Moved rotate and scale into entity and cleaned up rectangle.