Moved and renamed SurfaceClass to seperate files