Moved some menu stuff to proper packages