Merge "split Surface in two classes: SurfaceControl and Surface"