Move things around to handle awsbox deploy