Merge branch 'hotfix/6.4.1' into develop
Moved key definition file up to parent dir

Also shuffled around some keydefs for ergnomics
Better key bindings for common global use cases
Merge branch 'feature/restruct' into develop
Merge branch 'release/6.5.0'