Menu Update

Here is the start of the Menu. I also re-organized the packages.