Changes placeholder schema of 'Thing' with 'Surf' and refactors where needed.