Rereorganize for autodeploy