Reorganize code so only Autonomous