complete refactoring of disassembly engine