Move SDL.Joystick to SDL.Input.Joystick
Add SDL.Input.GameController (empty)