major organization changes

additionally some key mapping changes