Moved the joystick to lib/controller and changed the existing code to work with it