rearranging joystick-test project