Reorganized, more decoupled from Ontopad