diff --git a/corosync/include/ipc_amf.h b/openais/include/ipc_amf.h
similarity index 100%
rename from corosync/include/ipc_amf.h
rename to openais/include/ipc_amf.h
diff --git a/corosync/include/ipc_ckpt.h b/openais/include/ipc_ckpt.h
similarity index 100%
rename from corosync/include/ipc_ckpt.h
rename to openais/include/ipc_ckpt.h
diff --git a/corosync/include/ipc_clm.h b/openais/include/ipc_clm.h
similarity index 100%
rename from corosync/include/ipc_clm.h
rename to openais/include/ipc_clm.h
diff --git a/corosync/include/ipc_evt.h b/openais/include/ipc_evt.h
similarity index 100%
rename from corosync/include/ipc_evt.h
rename to openais/include/ipc_evt.h
diff --git a/corosync/include/ipc_lck.h b/openais/include/ipc_lck.h
similarity index 100%
rename from corosync/include/ipc_lck.h
rename to openais/include/ipc_lck.h
diff --git a/corosync/include/ipc_msg.h b/openais/include/ipc_msg.h
similarity index 100%
rename from corosync/include/ipc_msg.h
rename to openais/include/ipc_msg.h
diff --git a/corosync/include/mar_ckpt.h b/openais/include/mar_ckpt.h
similarity index 100%
rename from corosync/include/mar_ckpt.h
rename to openais/include/mar_ckpt.h
diff --git a/corosync/include/mar_clm.h b/openais/include/mar_clm.h
similarity index 100%
rename from corosync/include/mar_clm.h
rename to openais/include/mar_clm.h
diff --git a/corosync/include/mar_evt.h b/openais/include/mar_evt.h
similarity index 100%
rename from corosync/include/mar_evt.h
rename to openais/include/mar_evt.h
diff --git a/corosync/include/saAis.h b/openais/include/saAis.h
similarity index 100%
rename from corosync/include/saAis.h
rename to openais/include/saAis.h
diff --git a/corosync/include/saAmf.h b/openais/include/saAmf.h
similarity index 100%
rename from corosync/include/saAmf.h
rename to openais/include/saAmf.h
diff --git a/corosync/include/saCkpt.h b/openais/include/saCkpt.h
similarity index 100%
rename from corosync/include/saCkpt.h
rename to openais/include/saCkpt.h
diff --git a/corosync/include/saClm.h b/openais/include/saClm.h
similarity index 100%
rename from corosync/include/saClm.h
rename to openais/include/saClm.h
diff --git a/corosync/include/saEvt.h b/openais/include/saEvt.h
similarity index 100%
rename from corosync/include/saEvt.h
rename to openais/include/saEvt.h
diff --git a/corosync/include/saLck.h b/openais/include/saLck.h
similarity index 100%
rename from corosync/include/saLck.h
rename to openais/include/saLck.h
diff --git a/corosync/include/saMsg.h b/openais/include/saMsg.h
similarity index 100%
rename from corosync/include/saMsg.h
rename to openais/include/saMsg.h
diff --git a/corosync/lib/amf.c b/openais/lib/amf.c
similarity index 100%
rename from corosync/lib/amf.c
rename to openais/lib/amf.c
diff --git a/corosync/lib/ckpt.c b/openais/lib/ckpt.c
similarity index 100%
rename from corosync/lib/ckpt.c
rename to openais/lib/ckpt.c
diff --git a/corosync/lib/clm.c b/openais/lib/clm.c
similarity index 100%
rename from corosync/lib/clm.c
rename to openais/lib/clm.c
diff --git a/corosync/lib/evt.c b/openais/lib/evt.c
similarity index 100%
rename from corosync/lib/evt.c
rename to openais/lib/evt.c
diff --git a/corosync/lib/lck.c b/openais/lib/lck.c
similarity index 100%
rename from corosync/lib/lck.c
rename to openais/lib/lck.c
diff --git a/corosync/lib/libSaAis.versions b/openais/lib/libSaAis.versions
similarity index 100%
rename from corosync/lib/libSaAis.versions
rename to openais/lib/libSaAis.versions
diff --git a/corosync/lib/libSaAmf.versions b/openais/lib/libSaAmf.versions
similarity index 100%
rename from corosync/lib/libSaAmf.versions
rename to openais/lib/libSaAmf.versions
diff --git a/corosync/lib/libSaCkpt.versions b/openais/lib/libSaCkpt.versions
similarity index 100%
rename from corosync/lib/libSaCkpt.versions
rename to openais/lib/libSaCkpt.versions
diff --git a/corosync/lib/libSaEvt.versions b/openais/lib/libSaEvt.versions
similarity index 100%
rename from corosync/lib/libSaEvt.versions
rename to openais/lib/libSaEvt.versions
diff --git a/corosync/lib/libSaLck.versions b/openais/lib/libSaLck.versions
similarity index 100%
rename from corosync/lib/libSaLck.versions
rename to openais/lib/libSaLck.versions
diff --git a/corosync/lib/libaisutil.versions b/openais/lib/libaisutil.versions
similarity index 100%
rename from corosync/lib/libaisutil.versions
rename to openais/lib/libaisutil.versions
diff --git a/corosync/lib/msg.c b/openais/lib/msg.c
similarity index 100%
rename from corosync/lib/msg.c
rename to openais/lib/msg.c
diff --git a/corosync/exec/aisparser.c b/openais/services/aisparser.c
similarity index 100%
rename from corosync/exec/aisparser.c
rename to openais/services/aisparser.c
diff --git a/corosync/exec/amf.c b/openais/services/amf.c
similarity index 100%
rename from corosync/exec/amf.c
rename to openais/services/amf.c
diff --git a/corosync/exec/amf.h b/openais/services/amf.h
similarity index 100%
rename from corosync/exec/amf.h
rename to openais/services/amf.h
diff --git a/corosync/exec/amfapp.c b/openais/services/amfapp.c
similarity index 100%
rename from corosync/exec/amfapp.c
rename to openais/services/amfapp.c
diff --git a/corosync/exec/amfcluster.c b/openais/services/amfcluster.c
similarity index 100%
rename from corosync/exec/amfcluster.c
rename to openais/services/amfcluster.c
diff --git a/corosync/exec/amfcomp.c b/openais/services/amfcomp.c
similarity index 100%
rename from corosync/exec/amfcomp.c
rename to openais/services/amfcomp.c
diff --git a/corosync/exec/amfnode.c b/openais/services/amfnode.c
similarity index 100%
rename from corosync/exec/amfnode.c
rename to openais/services/amfnode.c
diff --git a/corosync/exec/amfsg.c b/openais/services/amfsg.c
similarity index 100%
rename from corosync/exec/amfsg.c
rename to openais/services/amfsg.c
diff --git a/corosync/exec/amfsi.c b/openais/services/amfsi.c
similarity index 100%
rename from corosync/exec/amfsi.c
rename to openais/services/amfsi.c
diff --git a/corosync/exec/amfsu.c b/openais/services/amfsu.c
similarity index 100%
rename from corosync/exec/amfsu.c
rename to openais/services/amfsu.c
diff --git a/corosync/exec/ckpt.c b/openais/services/ckpt.c
similarity index 100%
rename from corosync/exec/ckpt.c
rename to openais/services/ckpt.c
diff --git a/corosync/exec/clm.c b/openais/services/clm.c
similarity index 100%
rename from corosync/exec/clm.c
rename to openais/services/clm.c
diff --git a/corosync/exec/evt.c b/openais/services/evt.c
similarity index 100%
rename from corosync/exec/evt.c
rename to openais/services/evt.c
diff --git a/corosync/exec/lck.c b/openais/services/lck.c
similarity index 100%
rename from corosync/exec/lck.c
rename to openais/services/lck.c
diff --git a/corosync/exec/lck.h b/openais/services/lck.h
similarity index 100%
rename from corosync/exec/lck.h
rename to openais/services/lck.h
diff --git a/corosync/exec/openais-instantiate.c b/openais/services/openais-instantiate.c
similarity index 100%
rename from corosync/exec/openais-instantiate.c
rename to openais/services/openais-instantiate.c
diff --git a/corosync/test/ckpt-rd.c b/openais/test/ckpt-rd.c
similarity index 100%
rename from corosync/test/ckpt-rd.c
rename to openais/test/ckpt-rd.c
diff --git a/corosync/test/ckpt-wr.c b/openais/test/ckpt-wr.c
similarity index 100%
rename from corosync/test/ckpt-wr.c
rename to openais/test/ckpt-wr.c
diff --git a/corosync/test/ckptbench.c b/openais/test/ckptbench.c
similarity index 100%
rename from corosync/test/ckptbench.c
rename to openais/test/ckptbench.c
diff --git a/corosync/test/ckptbenchth.c b/openais/test/ckptbenchth.c
similarity index 100%
rename from corosync/test/ckptbenchth.c
rename to openais/test/ckptbenchth.c
diff --git a/corosync/test/ckptstress.c b/openais/test/ckptstress.c
similarity index 100%
rename from corosync/test/ckptstress.c
rename to openais/test/ckptstress.c
diff --git a/corosync/test/clc_cli_script b/openais/test/clc_cli_script
similarity index 100%
rename from corosync/test/clc_cli_script
rename to openais/test/clc_cli_script
diff --git a/corosync/test/comp_amf/takeover/Makefile b/openais/test/comp_amf/takeover/Makefile
similarity index 100%
rename from corosync/test/comp_amf/takeover/Makefile
rename to openais/test/comp_amf/takeover/Makefile
diff --git a/corosync/test/comp_amf/takeover/README.TXT b/openais/test/comp_amf/takeover/README.TXT
similarity index 100%
rename from corosync/test/comp_amf/takeover/README.TXT
rename to openais/test/comp_amf/takeover/README.TXT
diff --git a/corosync/test/comp_amf/takeover/amf.conf b/openais/test/comp_amf/takeover/amf.conf
similarity index 100%
rename from corosync/test/comp_amf/takeover/amf.conf
rename to openais/test/comp_amf/takeover/amf.conf
diff --git a/corosync/test/comp_amf/takeover/openais.conf b/openais/test/comp_amf/takeover/openais.conf
similarity index 100%
rename from corosync/test/comp_amf/takeover/openais.conf
rename to openais/test/comp_amf/takeover/openais.conf
diff --git a/corosync/test/comp_amf/takeover/serv_amf.c b/openais/test/comp_amf/takeover/serv_amf.c
similarity index 100%
rename from corosync/test/comp_amf/takeover/serv_amf.c
rename to openais/test/comp_amf/takeover/serv_amf.c
diff --git a/corosync/test/comp_amf/takeover/serv_amf.h b/openais/test/comp_amf/takeover/serv_amf.h
similarity index 100%
rename from corosync/test/comp_amf/takeover/serv_amf.h
rename to openais/test/comp_amf/takeover/serv_amf.h
diff --git a/corosync/test/comp_amf/takeover/serv_main.c b/openais/test/comp_amf/takeover/serv_main.c
similarity index 100%
rename from corosync/test/comp_amf/takeover/serv_main.c
rename to openais/test/comp_amf/takeover/serv_main.c
diff --git a/corosync/test/comp_amf/takeover/serv_main.h b/openais/test/comp_amf/takeover/serv_main.h
similarity index 100%
rename from corosync/test/comp_amf/takeover/serv_main.h
rename to openais/test/comp_amf/takeover/serv_main.h
diff --git a/corosync/test/comp_amf/takeover/takeover.sh b/openais/test/comp_amf/takeover/takeover.sh
similarity index 100%
rename from corosync/test/comp_amf/takeover/takeover.sh
rename to openais/test/comp_amf/takeover/takeover.sh
diff --git a/corosync/test/evtbench.c b/openais/test/evtbench.c
similarity index 100%
rename from corosync/test/evtbench.c
rename to openais/test/evtbench.c
diff --git a/corosync/test/subscription.c b/openais/test/subscription.c
similarity index 100%
rename from corosync/test/subscription.c
rename to openais/test/subscription.c
diff --git a/corosync/test/test.cpp b/openais/test/test.cpp
similarity index 100%
rename from corosync/test/test.cpp
rename to openais/test/test.cpp
diff --git a/corosync/test/testamf.c b/openais/test/testamf.c
similarity index 100%
rename from corosync/test/testamf.c
rename to openais/test/testamf.c
diff --git a/corosync/test/testamf1.c b/openais/test/testamf1.c
similarity index 100%
rename from corosync/test/testamf1.c
rename to openais/test/testamf1.c
diff --git a/corosync/test/testamf2.c b/openais/test/testamf2.c
similarity index 100%
rename from corosync/test/testamf2.c
rename to openais/test/testamf2.c
diff --git a/corosync/test/testamf3.c b/openais/test/testamf3.c
similarity index 100%
rename from corosync/test/testamf3.c
rename to openais/test/testamf3.c
diff --git a/corosync/test/testamf4.c b/openais/test/testamf4.c
similarity index 100%
rename from corosync/test/testamf4.c
rename to openais/test/testamf4.c
diff --git a/corosync/test/testamf5.c b/openais/test/testamf5.c
similarity index 100%
rename from corosync/test/testamf5.c
rename to openais/test/testamf5.c
diff --git a/corosync/test/testamf6.c b/openais/test/testamf6.c
similarity index 100%
rename from corosync/test/testamf6.c
rename to openais/test/testamf6.c
diff --git a/corosync/test/testamfth.c b/openais/test/testamfth.c
similarity index 100%
rename from corosync/test/testamfth.c
rename to openais/test/testamfth.c
diff --git a/corosync/test/testckpt.c b/openais/test/testckpt.c
similarity index 100%
rename from corosync/test/testckpt.c
rename to openais/test/testckpt.c
diff --git a/corosync/test/testclm.c b/openais/test/testclm.c
similarity index 100%
rename from corosync/test/testclm.c
rename to openais/test/testclm.c
diff --git a/corosync/test/testclm2.c b/openais/test/testclm2.c
similarity index 100%
rename from corosync/test/testclm2.c
rename to openais/test/testclm2.c
diff --git a/corosync/test/testevt.c b/openais/test/testevt.c
similarity index 100%
rename from corosync/test/testevt.c
rename to openais/test/testevt.c
diff --git a/corosync/test/testlck.c b/openais/test/testlck.c
similarity index 100%
rename from corosync/test/testlck.c
rename to openais/test/testlck.c
diff --git a/corosync/test/testmsg.c b/openais/test/testmsg.c
similarity index 100%
rename from corosync/test/testmsg.c
rename to openais/test/testmsg.c
diff --git a/corosync/test/testmsg2.c b/openais/test/testmsg2.c
similarity index 100%
rename from corosync/test/testmsg2.c
rename to openais/test/testmsg2.c
diff --git a/corosync/test/unlink.c b/openais/test/unlink.c
similarity index 100%
rename from corosync/test/unlink.c
rename to openais/test/unlink.c
diff --git a/corosync/test/publish.c b/openais/tets
similarity index 100%
rename from corosync/test/publish.c
rename to openais/tets