refactored package, added keymaps and menus