Refactor|Surface: Converted all Surface_* functions to methods of Surface