Change Contam.i ifdef guards
Add surface network builder, rename files