Refactor Menu package

Change-Id: Ie70b62ac756574c51ea1e2c8ab9b111d3fb8c5f2