Reorganize IPC and remove ELSA-IPC