Removed the "God" class named Source - now instantiators have been moved into their own Factory classes.