A bit of restructuring. Working on CommonSense interface