Renmae and restructure menu creation.