Update Generator, Add Sensors, Facts, and finalize Organization