Fix imports
Rename JoystickId to Joystick, convert joystick mod to an impl on Joystick