Reorganized plugins, changed some shortcuts