restructure, add auton switching stub