Restructure & Removal of PopupMenuAPI