Moved types in to matching files

Refactored menu service somewhat.
Re-Commit

Missed files.