Moved a few input defs into input namespace.
Renamed button_t to button_id_t, updated var names.