move popup and spinner into the menu directory