Wait Auto

Created a wait auto (has not been tested) and moved drivers to different
location.