Fixing up main menu.

Why do this have a main menu separate from the toolbar again?
Only applies to canvases.
Removing main menu.
Moved lotsa stuff to toolbar dir.