Moving things around to fix a deployment issue