Refactor menu class name and package structure