ContextMenu: Moved to own package