Major reformatting and regrouping. Easy motion and switch vim removing. Shortcuts refactoring.