Moved SurfaceTheme to surface folder.