Organ code refactoring

Moved procs around, added comments, cut out unused code.
Not much change mechanic wise.