Moving Menus to ui.menu.*, code structure changes