wisdom: removed duplicating logic
Moved several modules from core to tools