Delete Surf functionality

Deleting a surf now requires a reassigning of surfices.
Files were moved to clean up folders