minor cleanup
restructure decompile macro support
check files