Structure

More logical groups of keys to make reading and changing easier.