Merge pull request #6 from nigelgbanks/7.x-filename-conventions

Filename conventions.
Update menu path for moved file.