Move things to their proper place for API experiment.