Replace representation of drawings with OO model
Make move shape tool work