Added keyboard mapping to machine.json, removed system.json