Disassembler no longer loads extra classes
Improve top level scripts