Merge ojwidgets + Remove functors + Adapt

The organization also changed