Move surge related source to main library