Move some prereqs around to satisfy new state structure