Move SwapBlockSurface class into distinct file
Made use of SwapBlocksSurface as a view within xml file.