Minor renamings, added menu, removed old file