Moving things around for production