Remove useless classes, more refactoring, some doc