Refactoring Menu and Common files.- Phase 1
Refactroing the Menu - Phase2