menu changes and some file renames