Move shapes in their own .cpp and .h