Switch to managing base_directory, not data_directory