Basic gamepad support, reorganisation