Reorganizing representation of control mechanisms

Removed joystick controls; added controller tracking; renamed controls
to schemes;