Unified: renamed menu2 dir to 'menu'