Making the re-arranged structure the default