deleted obsolete classes, refactoring, add walkers
Merge remote-tracking branch 'origin/master'