Delete wrong files
Code ready for instrospector code splitting
Compilation issues and test regressions fixed
refactoring