Revert "(RMenu) Refactor rmenu"

This reverts commit 6e8e22a458eaafa10af381133eb5edcf16cbb6ae.