reorganized source fac
sink facility added, cleaned up source