Cleaver Organization

We drop Options-Framework in favor of Option-tree, the main reason was
UI