Refactor packages
Fix type and move keybindings to evil-leader initialization
Small changes to init.el