GitHub #137: Refactor for new filenames
GitHub #137: More refactoring.  mfp/mfpgui will now launch!