More Organization. Added Gamepad functionality. Will test later.