[debugger] fixed debugger for new structure;
Merge branch 'feature/commandline-debugger' into experimental