diff --git a/grauph/src/engine/AlsaMidiDriver.cpp b/grauph/src/libs/engine/AlsaMidiDriver.cpp
similarity index 100%
rename from grauph/src/engine/AlsaMidiDriver.cpp
rename to grauph/src/libs/engine/AlsaMidiDriver.cpp
diff --git a/grauph/src/engine/AlsaMidiDriver.h b/grauph/src/libs/engine/AlsaMidiDriver.h
similarity index 100%
rename from grauph/src/engine/AlsaMidiDriver.h
rename to grauph/src/libs/engine/AlsaMidiDriver.h
diff --git a/grauph/src/engine/Array.h b/grauph/src/libs/engine/Array.h
similarity index 100%
rename from grauph/src/engine/Array.h
rename to grauph/src/libs/engine/Array.h
diff --git a/grauph/src/engine/AudioDriver.h b/grauph/src/libs/engine/AudioDriver.h
similarity index 100%
rename from grauph/src/engine/AudioDriver.h
rename to grauph/src/libs/engine/AudioDriver.h
diff --git a/grauph/src/engine/AudioInputNode.cpp b/grauph/src/libs/engine/AudioInputNode.cpp
similarity index 100%
rename from grauph/src/engine/AudioInputNode.cpp
rename to grauph/src/libs/engine/AudioInputNode.cpp
diff --git a/grauph/src/engine/AudioInputNode.h b/grauph/src/libs/engine/AudioInputNode.h
similarity index 100%
rename from grauph/src/engine/AudioInputNode.h
rename to grauph/src/libs/engine/AudioInputNode.h
diff --git a/grauph/src/engine/AudioOutputNode.cpp b/grauph/src/libs/engine/AudioOutputNode.cpp
similarity index 100%
rename from grauph/src/engine/AudioOutputNode.cpp
rename to grauph/src/libs/engine/AudioOutputNode.cpp
diff --git a/grauph/src/engine/AudioOutputNode.h b/grauph/src/libs/engine/AudioOutputNode.h
similarity index 100%
rename from grauph/src/engine/AudioOutputNode.h
rename to grauph/src/libs/engine/AudioOutputNode.h
diff --git a/grauph/src/engine/BridgeNode.cpp b/grauph/src/libs/engine/BridgeNode.cpp
similarity index 100%
rename from grauph/src/engine/BridgeNode.cpp
rename to grauph/src/libs/engine/BridgeNode.cpp
diff --git a/grauph/src/engine/BridgeNode.h b/grauph/src/libs/engine/BridgeNode.h
similarity index 100%
rename from grauph/src/engine/BridgeNode.h
rename to grauph/src/libs/engine/BridgeNode.h
diff --git a/grauph/src/engine/Buffer.cpp b/grauph/src/libs/engine/Buffer.cpp
similarity index 100%
rename from grauph/src/engine/Buffer.cpp
rename to grauph/src/libs/engine/Buffer.cpp
diff --git a/grauph/src/engine/Buffer.h b/grauph/src/libs/engine/Buffer.h
similarity index 100%
rename from grauph/src/engine/Buffer.h
rename to grauph/src/libs/engine/Buffer.h
diff --git a/grauph/src/engine/ClientBroadcaster.cpp b/grauph/src/libs/engine/ClientBroadcaster.cpp
similarity index 100%
rename from grauph/src/engine/ClientBroadcaster.cpp
rename to grauph/src/libs/engine/ClientBroadcaster.cpp
diff --git a/grauph/src/engine/ClientBroadcaster.h b/grauph/src/libs/engine/ClientBroadcaster.h
similarity index 100%
rename from grauph/src/engine/ClientBroadcaster.h
rename to grauph/src/libs/engine/ClientBroadcaster.h
diff --git a/grauph/src/engine/Connection.cpp b/grauph/src/libs/engine/Connection.cpp
similarity index 100%
rename from grauph/src/engine/Connection.cpp
rename to grauph/src/libs/engine/Connection.cpp
diff --git a/grauph/src/engine/Connection.h b/grauph/src/libs/engine/Connection.h
similarity index 100%
rename from grauph/src/engine/Connection.h
rename to grauph/src/libs/engine/Connection.h
diff --git a/grauph/src/engine/ConnectionBase.cpp b/grauph/src/libs/engine/ConnectionBase.cpp
similarity index 100%
rename from grauph/src/engine/ConnectionBase.cpp
rename to grauph/src/libs/engine/ConnectionBase.cpp
diff --git a/grauph/src/engine/ConnectionBase.h b/grauph/src/libs/engine/ConnectionBase.h
similarity index 100%
rename from grauph/src/engine/ConnectionBase.h
rename to grauph/src/libs/engine/ConnectionBase.h
diff --git a/grauph/src/engine/ControlInputNode.cpp b/grauph/src/libs/engine/ControlInputNode.cpp
similarity index 100%
rename from grauph/src/engine/ControlInputNode.cpp
rename to grauph/src/libs/engine/ControlInputNode.cpp
diff --git a/grauph/src/engine/ControlInputNode.h b/grauph/src/libs/engine/ControlInputNode.h
similarity index 100%
rename from grauph/src/engine/ControlInputNode.h
rename to grauph/src/libs/engine/ControlInputNode.h
diff --git a/grauph/src/engine/ControlOutputNode.cpp b/grauph/src/libs/engine/ControlOutputNode.cpp
similarity index 100%
rename from grauph/src/engine/ControlOutputNode.cpp
rename to grauph/src/libs/engine/ControlOutputNode.cpp
diff --git a/grauph/src/engine/ControlOutputNode.h b/grauph/src/libs/engine/ControlOutputNode.h
similarity index 100%
rename from grauph/src/engine/ControlOutputNode.h
rename to grauph/src/libs/engine/ControlOutputNode.h
diff --git a/grauph/src/engine/Controller.h b/grauph/src/libs/engine/Controller.h
similarity index 100%
rename from grauph/src/engine/Controller.h
rename to grauph/src/libs/engine/Controller.h
diff --git a/grauph/src/engine/DSSIPlugin.cpp b/grauph/src/libs/engine/DSSIPlugin.cpp
similarity index 100%
rename from grauph/src/engine/DSSIPlugin.cpp
rename to grauph/src/libs/engine/DSSIPlugin.cpp
diff --git a/grauph/src/engine/DSSIPlugin.cpp.orig b/grauph/src/libs/engine/DSSIPlugin.cpp.orig
similarity index 100%
rename from grauph/src/engine/DSSIPlugin.cpp.orig
rename to grauph/src/libs/engine/DSSIPlugin.cpp.orig
diff --git a/grauph/src/engine/DSSIPlugin.h b/grauph/src/libs/engine/DSSIPlugin.h
similarity index 100%
rename from grauph/src/engine/DSSIPlugin.h
rename to grauph/src/libs/engine/DSSIPlugin.h
diff --git a/grauph/src/engine/DSSIPlugin.h.orig b/grauph/src/libs/engine/DSSIPlugin.h.orig
similarity index 100%
rename from grauph/src/engine/DSSIPlugin.h.orig
rename to grauph/src/libs/engine/DSSIPlugin.h.orig
diff --git a/grauph/src/engine/Driver.h b/grauph/src/libs/engine/Driver.h
similarity index 100%
rename from grauph/src/engine/Driver.h
rename to grauph/src/libs/engine/Driver.h
diff --git a/grauph/src/engine/Event.cpp b/grauph/src/libs/engine/Event.cpp
similarity index 100%
rename from grauph/src/engine/Event.cpp
rename to grauph/src/libs/engine/Event.cpp
diff --git a/grauph/src/engine/Event.h b/grauph/src/libs/engine/Event.h
similarity index 100%
rename from grauph/src/engine/Event.h
rename to grauph/src/libs/engine/Event.h
diff --git a/grauph/src/engine/EventSource.h b/grauph/src/libs/engine/EventSource.h
similarity index 100%
rename from grauph/src/engine/EventSource.h
rename to grauph/src/libs/engine/EventSource.h
diff --git a/grauph/src/engine/InputPort.cpp b/grauph/src/libs/engine/InputPort.cpp
similarity index 100%
rename from grauph/src/engine/InputPort.cpp
rename to grauph/src/libs/engine/InputPort.cpp
diff --git a/grauph/src/engine/InputPort.h b/grauph/src/libs/engine/InputPort.h
similarity index 100%
rename from grauph/src/engine/InputPort.h
rename to grauph/src/libs/engine/InputPort.h
diff --git a/grauph/src/engine/InternalNode.h b/grauph/src/libs/engine/InternalNode.h
similarity index 100%
rename from grauph/src/engine/InternalNode.h
rename to grauph/src/libs/engine/InternalNode.h
diff --git a/grauph/src/engine/JackAudioDriver.cpp b/grauph/src/libs/engine/JackAudioDriver.cpp
similarity index 100%
rename from grauph/src/engine/JackAudioDriver.cpp
rename to grauph/src/libs/engine/JackAudioDriver.cpp
diff --git a/grauph/src/engine/JackAudioDriver.h b/grauph/src/libs/engine/JackAudioDriver.h
similarity index 100%
rename from grauph/src/engine/JackAudioDriver.h
rename to grauph/src/libs/engine/JackAudioDriver.h
diff --git a/grauph/src/engine/JackMidiDriver.cpp b/grauph/src/libs/engine/JackMidiDriver.cpp
similarity index 100%
rename from grauph/src/engine/JackMidiDriver.cpp
rename to grauph/src/libs/engine/JackMidiDriver.cpp
diff --git a/grauph/src/engine/JackMidiDriver.h b/grauph/src/libs/engine/JackMidiDriver.h
similarity index 100%
rename from grauph/src/engine/JackMidiDriver.h
rename to grauph/src/libs/engine/JackMidiDriver.h
diff --git a/grauph/src/engine/LADSPAPlugin.cpp b/grauph/src/libs/engine/LADSPAPlugin.cpp
similarity index 100%
rename from grauph/src/engine/LADSPAPlugin.cpp
rename to grauph/src/libs/engine/LADSPAPlugin.cpp
diff --git a/grauph/src/engine/LADSPAPlugin.h b/grauph/src/libs/engine/LADSPAPlugin.h
similarity index 100%
rename from grauph/src/engine/LADSPAPlugin.h
rename to grauph/src/libs/engine/LADSPAPlugin.h
diff --git a/grauph/src/engine/LV2Plugin.cpp b/grauph/src/libs/engine/LV2Plugin.cpp
similarity index 100%
rename from grauph/src/engine/LV2Plugin.cpp
rename to grauph/src/libs/engine/LV2Plugin.cpp
diff --git a/grauph/src/engine/LV2Plugin.h b/grauph/src/libs/engine/LV2Plugin.h
similarity index 100%
rename from grauph/src/engine/LV2Plugin.h
rename to grauph/src/libs/engine/LV2Plugin.h
diff --git a/grauph/src/engine/LashDriver.cpp b/grauph/src/libs/engine/LashDriver.cpp
similarity index 100%
rename from grauph/src/engine/LashDriver.cpp
rename to grauph/src/libs/engine/LashDriver.cpp
diff --git a/grauph/src/engine/LashDriver.h b/grauph/src/libs/engine/LashDriver.h
similarity index 100%
rename from grauph/src/engine/LashDriver.h
rename to grauph/src/libs/engine/LashDriver.h
diff --git a/grauph/src/engine/List.h b/grauph/src/libs/engine/List.h
similarity index 100%
rename from grauph/src/engine/List.h
rename to grauph/src/libs/engine/List.h
diff --git a/grauph/src/engine/Maid.cpp b/grauph/src/libs/engine/Maid.cpp
similarity index 100%
rename from grauph/src/engine/Maid.cpp
rename to grauph/src/libs/engine/Maid.cpp
diff --git a/grauph/src/engine/Maid.h b/grauph/src/libs/engine/Maid.h
similarity index 100%
rename from grauph/src/engine/Maid.h
rename to grauph/src/libs/engine/Maid.h
diff --git a/grauph/src/engine/MaidObject.h b/grauph/src/libs/engine/MaidObject.h
similarity index 100%
rename from grauph/src/engine/MaidObject.h
rename to grauph/src/libs/engine/MaidObject.h
diff --git a/grauph/src/engine/Makefile.am b/grauph/src/libs/engine/Makefile.am
similarity index 100%
rename from grauph/src/engine/Makefile.am
rename to grauph/src/libs/engine/Makefile.am
diff --git a/grauph/src/engine/MidiControlNode.cpp b/grauph/src/libs/engine/MidiControlNode.cpp
similarity index 100%
rename from grauph/src/engine/MidiControlNode.cpp
rename to grauph/src/libs/engine/MidiControlNode.cpp
diff --git a/grauph/src/engine/MidiControlNode.h b/grauph/src/libs/engine/MidiControlNode.h
similarity index 100%
rename from grauph/src/engine/MidiControlNode.h
rename to grauph/src/libs/engine/MidiControlNode.h
diff --git a/grauph/src/engine/MidiDriver.h b/grauph/src/libs/engine/MidiDriver.h
similarity index 100%
rename from grauph/src/engine/MidiDriver.h
rename to grauph/src/libs/engine/MidiDriver.h
diff --git a/grauph/src/engine/MidiInputNode.cpp b/grauph/src/libs/engine/MidiInputNode.cpp
similarity index 100%
rename from grauph/src/engine/MidiInputNode.cpp
rename to grauph/src/libs/engine/MidiInputNode.cpp
diff --git a/grauph/src/engine/MidiInputNode.h b/grauph/src/libs/engine/MidiInputNode.h
similarity index 100%
rename from grauph/src/engine/MidiInputNode.h
rename to grauph/src/libs/engine/MidiInputNode.h
diff --git a/grauph/src/engine/MidiMessage.h b/grauph/src/libs/engine/MidiMessage.h
similarity index 100%
rename from grauph/src/engine/MidiMessage.h
rename to grauph/src/libs/engine/MidiMessage.h
diff --git a/grauph/src/engine/MidiNoteNode.cpp b/grauph/src/libs/engine/MidiNoteNode.cpp
similarity index 100%
rename from grauph/src/engine/MidiNoteNode.cpp
rename to grauph/src/libs/engine/MidiNoteNode.cpp
diff --git a/grauph/src/engine/MidiNoteNode.h b/grauph/src/libs/engine/MidiNoteNode.h
similarity index 100%
rename from grauph/src/engine/MidiNoteNode.h
rename to grauph/src/libs/engine/MidiNoteNode.h
diff --git a/grauph/src/engine/MidiOutputNode.cpp b/grauph/src/libs/engine/MidiOutputNode.cpp
similarity index 100%
rename from grauph/src/engine/MidiOutputNode.cpp
rename to grauph/src/libs/engine/MidiOutputNode.cpp
diff --git a/grauph/src/engine/MidiOutputNode.h b/grauph/src/libs/engine/MidiOutputNode.h
similarity index 100%
rename from grauph/src/engine/MidiOutputNode.h
rename to grauph/src/libs/engine/MidiOutputNode.h
diff --git a/grauph/src/engine/MidiTriggerNode.cpp b/grauph/src/libs/engine/MidiTriggerNode.cpp
similarity index 100%
rename from grauph/src/engine/MidiTriggerNode.cpp
rename to grauph/src/libs/engine/MidiTriggerNode.cpp
diff --git a/grauph/src/engine/MidiTriggerNode.h b/grauph/src/libs/engine/MidiTriggerNode.h
similarity index 100%
rename from grauph/src/engine/MidiTriggerNode.h
rename to grauph/src/libs/engine/MidiTriggerNode.h
diff --git a/grauph/src/engine/Node.h b/grauph/src/libs/engine/Node.h
similarity index 100%
rename from grauph/src/engine/Node.h
rename to grauph/src/libs/engine/Node.h
diff --git a/grauph/src/engine/NodeBase.cpp b/grauph/src/libs/engine/NodeBase.cpp
similarity index 100%
rename from grauph/src/engine/NodeBase.cpp
rename to grauph/src/libs/engine/NodeBase.cpp
diff --git a/grauph/src/engine/NodeBase.h b/grauph/src/libs/engine/NodeBase.h
similarity index 100%
rename from grauph/src/engine/NodeBase.h
rename to grauph/src/libs/engine/NodeBase.h
diff --git a/grauph/src/engine/NodeFactory.cpp b/grauph/src/libs/engine/NodeFactory.cpp
similarity index 100%
rename from grauph/src/engine/NodeFactory.cpp
rename to grauph/src/libs/engine/NodeFactory.cpp
diff --git a/grauph/src/engine/NodeFactory.h b/grauph/src/libs/engine/NodeFactory.h
similarity index 100%
rename from grauph/src/engine/NodeFactory.h
rename to grauph/src/libs/engine/NodeFactory.h
diff --git a/grauph/src/engine/OSCClient.cpp b/grauph/src/libs/engine/OSCClient.cpp
similarity index 100%
rename from grauph/src/engine/OSCClient.cpp
rename to grauph/src/libs/engine/OSCClient.cpp
diff --git a/grauph/src/engine/OSCClient.h b/grauph/src/libs/engine/OSCClient.h
similarity index 100%
rename from grauph/src/engine/OSCClient.h
rename to grauph/src/libs/engine/OSCClient.h
diff --git a/grauph/src/engine/OSCReceiver.cpp b/grauph/src/libs/engine/OSCReceiver.cpp
similarity index 100%
rename from grauph/src/engine/OSCReceiver.cpp
rename to grauph/src/libs/engine/OSCReceiver.cpp
diff --git a/grauph/src/engine/OSCReceiver.h b/grauph/src/libs/engine/OSCReceiver.h
similarity index 100%
rename from grauph/src/engine/OSCReceiver.h
rename to grauph/src/libs/engine/OSCReceiver.h
diff --git a/grauph/src/engine/OSCResponder.cpp b/grauph/src/libs/engine/OSCResponder.cpp
similarity index 100%
rename from grauph/src/engine/OSCResponder.cpp
rename to grauph/src/libs/engine/OSCResponder.cpp
diff --git a/grauph/src/engine/OSCResponder.h b/grauph/src/libs/engine/OSCResponder.h
similarity index 100%
rename from grauph/src/engine/OSCResponder.h
rename to grauph/src/libs/engine/OSCResponder.h
diff --git a/grauph/src/engine/ObjectSender.cpp b/grauph/src/libs/engine/ObjectSender.cpp
similarity index 100%
rename from grauph/src/engine/ObjectSender.cpp
rename to grauph/src/libs/engine/ObjectSender.cpp
diff --git a/grauph/src/engine/ObjectSender.h b/grauph/src/libs/engine/ObjectSender.h
similarity index 100%
rename from grauph/src/engine/ObjectSender.h
rename to grauph/src/libs/engine/ObjectSender.h
diff --git a/grauph/src/engine/ObjectStore.cpp b/grauph/src/libs/engine/ObjectStore.cpp
similarity index 100%
rename from grauph/src/engine/ObjectStore.cpp
rename to grauph/src/libs/engine/ObjectStore.cpp
diff --git a/grauph/src/engine/ObjectStore.h b/grauph/src/libs/engine/ObjectStore.h
similarity index 100%
rename from grauph/src/engine/ObjectStore.h
rename to grauph/src/libs/engine/ObjectStore.h
diff --git a/grauph/src/engine/Om.cpp b/grauph/src/libs/engine/Om.cpp
similarity index 100%
rename from grauph/src/engine/Om.cpp
rename to grauph/src/libs/engine/Om.cpp
diff --git a/grauph/src/engine/Om.h b/grauph/src/libs/engine/Om.h
similarity index 100%
rename from grauph/src/engine/Om.h
rename to grauph/src/libs/engine/Om.h
diff --git a/grauph/src/engine/OmApp.cpp b/grauph/src/libs/engine/OmApp.cpp
similarity index 100%
rename from grauph/src/engine/OmApp.cpp
rename to grauph/src/libs/engine/OmApp.cpp
diff --git a/grauph/src/engine/OmApp.h b/grauph/src/libs/engine/OmApp.h
similarity index 100%
rename from grauph/src/engine/OmApp.h
rename to grauph/src/libs/engine/OmApp.h
diff --git a/grauph/src/engine/OmInProcess.cpp b/grauph/src/libs/engine/OmInProcess.cpp
similarity index 100%
rename from grauph/src/engine/OmInProcess.cpp
rename to grauph/src/libs/engine/OmInProcess.cpp
diff --git a/grauph/src/engine/OmObject.h b/grauph/src/libs/engine/OmObject.h
similarity index 100%
rename from grauph/src/engine/OmObject.h
rename to grauph/src/libs/engine/OmObject.h
diff --git a/grauph/src/engine/OutputPort.cpp b/grauph/src/libs/engine/OutputPort.cpp
similarity index 100%
rename from grauph/src/engine/OutputPort.cpp
rename to grauph/src/libs/engine/OutputPort.cpp
diff --git a/grauph/src/engine/OutputPort.h b/grauph/src/libs/engine/OutputPort.h
similarity index 100%
rename from grauph/src/engine/OutputPort.h
rename to grauph/src/libs/engine/OutputPort.h
diff --git a/grauph/src/engine/Patch.cpp b/grauph/src/libs/engine/Patch.cpp
similarity index 100%
rename from grauph/src/engine/Patch.cpp
rename to grauph/src/libs/engine/Patch.cpp
diff --git a/grauph/src/engine/Patch.h b/grauph/src/libs/engine/Patch.h
similarity index 100%
rename from grauph/src/engine/Patch.h
rename to grauph/src/libs/engine/Patch.h
diff --git a/grauph/src/engine/Plugin.h b/grauph/src/libs/engine/Plugin.h
similarity index 100%
rename from grauph/src/engine/Plugin.h
rename to grauph/src/libs/engine/Plugin.h
diff --git a/grauph/src/engine/PluginLibrary.h b/grauph/src/libs/engine/PluginLibrary.h
similarity index 100%
rename from grauph/src/engine/PluginLibrary.h
rename to grauph/src/libs/engine/PluginLibrary.h
diff --git a/grauph/src/engine/Port.cpp b/grauph/src/libs/engine/Port.cpp
similarity index 100%
rename from grauph/src/engine/Port.cpp
rename to grauph/src/libs/engine/Port.cpp
diff --git a/grauph/src/engine/Port.h b/grauph/src/libs/engine/Port.h
similarity index 100%
rename from grauph/src/engine/Port.h
rename to grauph/src/libs/engine/Port.h
diff --git a/grauph/src/engine/PortBase.cpp b/grauph/src/libs/engine/PortBase.cpp
similarity index 100%
rename from grauph/src/engine/PortBase.cpp
rename to grauph/src/libs/engine/PortBase.cpp
diff --git a/grauph/src/engine/PortBase.h b/grauph/src/libs/engine/PortBase.h
similarity index 100%
rename from grauph/src/engine/PortBase.h
rename to grauph/src/libs/engine/PortBase.h
diff --git a/grauph/src/engine/PortInfo.h b/grauph/src/libs/engine/PortInfo.h
similarity index 100%
rename from grauph/src/engine/PortInfo.h
rename to grauph/src/libs/engine/PortInfo.h
diff --git a/grauph/src/engine/PostProcessor.cpp b/grauph/src/libs/engine/PostProcessor.cpp
similarity index 100%
rename from grauph/src/engine/PostProcessor.cpp
rename to grauph/src/libs/engine/PostProcessor.cpp
diff --git a/grauph/src/engine/PostProcessor.h b/grauph/src/libs/engine/PostProcessor.h
similarity index 100%
rename from grauph/src/engine/PostProcessor.h
rename to grauph/src/libs/engine/PostProcessor.h
diff --git a/grauph/src/engine/QueuedEngineInterface.cpp b/grauph/src/libs/engine/QueuedEngineInterface.cpp
similarity index 100%
rename from grauph/src/engine/QueuedEngineInterface.cpp
rename to grauph/src/libs/engine/QueuedEngineInterface.cpp
diff --git a/grauph/src/engine/QueuedEngineInterface.h b/grauph/src/libs/engine/QueuedEngineInterface.h
similarity index 100%
rename from grauph/src/engine/QueuedEngineInterface.h
rename to grauph/src/libs/engine/QueuedEngineInterface.h
diff --git a/grauph/src/engine/QueuedEvent.h b/grauph/src/libs/engine/QueuedEvent.h
similarity index 100%
rename from grauph/src/engine/QueuedEvent.h
rename to grauph/src/libs/engine/QueuedEvent.h
diff --git a/grauph/src/engine/QueuedEventSource.cpp b/grauph/src/libs/engine/QueuedEventSource.cpp
similarity index 100%
rename from grauph/src/engine/QueuedEventSource.cpp
rename to grauph/src/libs/engine/QueuedEventSource.cpp
diff --git a/grauph/src/engine/QueuedEventSource.h b/grauph/src/libs/engine/QueuedEventSource.h
similarity index 100%
rename from grauph/src/engine/QueuedEventSource.h
rename to grauph/src/libs/engine/QueuedEventSource.h
diff --git a/grauph/src/engine/Responder.h b/grauph/src/libs/engine/Responder.h
similarity index 100%
rename from grauph/src/engine/Responder.h
rename to grauph/src/libs/engine/Responder.h
diff --git a/grauph/src/engine/TransportNode.cpp b/grauph/src/libs/engine/TransportNode.cpp
similarity index 100%
rename from grauph/src/engine/TransportNode.cpp
rename to grauph/src/libs/engine/TransportNode.cpp
diff --git a/grauph/src/engine/TransportNode.h b/grauph/src/libs/engine/TransportNode.h
similarity index 100%
rename from grauph/src/engine/TransportNode.h
rename to grauph/src/libs/engine/TransportNode.h
diff --git a/grauph/src/engine/Tree.h b/grauph/src/libs/engine/Tree.h
similarity index 100%
rename from grauph/src/engine/Tree.h
rename to grauph/src/libs/engine/Tree.h
diff --git a/grauph/src/engine/TreeImplementation.h b/grauph/src/libs/engine/TreeImplementation.h
similarity index 100%
rename from grauph/src/engine/TreeImplementation.h
rename to grauph/src/libs/engine/TreeImplementation.h
diff --git a/grauph/src/engine/cmdline.c b/grauph/src/libs/engine/cmdline.c
similarity index 100%
rename from grauph/src/engine/cmdline.c
rename to grauph/src/libs/engine/cmdline.c
diff --git a/grauph/src/engine/cmdline.ggo b/grauph/src/libs/engine/cmdline.ggo
similarity index 100%
rename from grauph/src/engine/cmdline.ggo
rename to grauph/src/libs/engine/cmdline.ggo
diff --git a/grauph/src/engine/cmdline.h b/grauph/src/libs/engine/cmdline.h
similarity index 100%
rename from grauph/src/engine/cmdline.h
rename to grauph/src/libs/engine/cmdline.h
diff --git a/grauph/src/engine/events.h b/grauph/src/libs/engine/events.h
similarity index 100%
rename from grauph/src/engine/events.h
rename to grauph/src/libs/engine/events.h
diff --git a/grauph/src/engine/events/ActivateEvent.cpp b/grauph/src/libs/engine/events/ActivateEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/ActivateEvent.cpp
rename to grauph/src/libs/engine/events/ActivateEvent.cpp
diff --git a/grauph/src/engine/events/ActivateEvent.h b/grauph/src/libs/engine/events/ActivateEvent.h
similarity index 100%
rename from grauph/src/engine/events/ActivateEvent.h
rename to grauph/src/libs/engine/events/ActivateEvent.h
diff --git a/grauph/src/engine/events/AddNodeEvent.cpp b/grauph/src/libs/engine/events/AddNodeEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/AddNodeEvent.cpp
rename to grauph/src/libs/engine/events/AddNodeEvent.cpp
diff --git a/grauph/src/engine/events/AddNodeEvent.h b/grauph/src/libs/engine/events/AddNodeEvent.h
similarity index 100%
rename from grauph/src/engine/events/AddNodeEvent.h
rename to grauph/src/libs/engine/events/AddNodeEvent.h
diff --git a/grauph/src/engine/events/AllNotesOffEvent.cpp b/grauph/src/libs/engine/events/AllNotesOffEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/AllNotesOffEvent.cpp
rename to grauph/src/libs/engine/events/AllNotesOffEvent.cpp
diff --git a/grauph/src/engine/events/AllNotesOffEvent.h b/grauph/src/libs/engine/events/AllNotesOffEvent.h
similarity index 100%
rename from grauph/src/engine/events/AllNotesOffEvent.h
rename to grauph/src/libs/engine/events/AllNotesOffEvent.h
diff --git a/grauph/src/engine/events/ClearPatchEvent.cpp b/grauph/src/libs/engine/events/ClearPatchEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/ClearPatchEvent.cpp
rename to grauph/src/libs/engine/events/ClearPatchEvent.cpp
diff --git a/grauph/src/engine/events/ClearPatchEvent.h b/grauph/src/libs/engine/events/ClearPatchEvent.h
similarity index 100%
rename from grauph/src/engine/events/ClearPatchEvent.h
rename to grauph/src/libs/engine/events/ClearPatchEvent.h
diff --git a/grauph/src/engine/events/ConnectionEvent.cpp b/grauph/src/libs/engine/events/ConnectionEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/ConnectionEvent.cpp
rename to grauph/src/libs/engine/events/ConnectionEvent.cpp
diff --git a/grauph/src/engine/events/ConnectionEvent.h b/grauph/src/libs/engine/events/ConnectionEvent.h
similarity index 100%
rename from grauph/src/engine/events/ConnectionEvent.h
rename to grauph/src/libs/engine/events/ConnectionEvent.h
diff --git a/grauph/src/engine/events/CreatePatchEvent.cpp b/grauph/src/libs/engine/events/CreatePatchEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/CreatePatchEvent.cpp
rename to grauph/src/libs/engine/events/CreatePatchEvent.cpp
diff --git a/grauph/src/engine/events/CreatePatchEvent.h b/grauph/src/libs/engine/events/CreatePatchEvent.h
similarity index 100%
rename from grauph/src/engine/events/CreatePatchEvent.h
rename to grauph/src/libs/engine/events/CreatePatchEvent.h
diff --git a/grauph/src/engine/events/DSSIConfigureEvent.cpp b/grauph/src/libs/engine/events/DSSIConfigureEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DSSIConfigureEvent.cpp
rename to grauph/src/libs/engine/events/DSSIConfigureEvent.cpp
diff --git a/grauph/src/engine/events/DSSIConfigureEvent.h b/grauph/src/libs/engine/events/DSSIConfigureEvent.h
similarity index 100%
rename from grauph/src/engine/events/DSSIConfigureEvent.h
rename to grauph/src/libs/engine/events/DSSIConfigureEvent.h
diff --git a/grauph/src/engine/events/DSSIControlEvent.cpp b/grauph/src/libs/engine/events/DSSIControlEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DSSIControlEvent.cpp
rename to grauph/src/libs/engine/events/DSSIControlEvent.cpp
diff --git a/grauph/src/engine/events/DSSIControlEvent.h b/grauph/src/libs/engine/events/DSSIControlEvent.h
similarity index 100%
rename from grauph/src/engine/events/DSSIControlEvent.h
rename to grauph/src/libs/engine/events/DSSIControlEvent.h
diff --git a/grauph/src/engine/events/DSSIProgramEvent.cpp b/grauph/src/libs/engine/events/DSSIProgramEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DSSIProgramEvent.cpp
rename to grauph/src/libs/engine/events/DSSIProgramEvent.cpp
diff --git a/grauph/src/engine/events/DSSIProgramEvent.h b/grauph/src/libs/engine/events/DSSIProgramEvent.h
similarity index 100%
rename from grauph/src/engine/events/DSSIProgramEvent.h
rename to grauph/src/libs/engine/events/DSSIProgramEvent.h
diff --git a/grauph/src/engine/events/DSSIUpdateEvent.cpp b/grauph/src/libs/engine/events/DSSIUpdateEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DSSIUpdateEvent.cpp
rename to grauph/src/libs/engine/events/DSSIUpdateEvent.cpp
diff --git a/grauph/src/engine/events/DSSIUpdateEvent.h b/grauph/src/libs/engine/events/DSSIUpdateEvent.h
similarity index 100%
rename from grauph/src/engine/events/DSSIUpdateEvent.h
rename to grauph/src/libs/engine/events/DSSIUpdateEvent.h
diff --git a/grauph/src/engine/events/DeactivateEvent.cpp b/grauph/src/libs/engine/events/DeactivateEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DeactivateEvent.cpp
rename to grauph/src/libs/engine/events/DeactivateEvent.cpp
diff --git a/grauph/src/engine/events/DeactivateEvent.h b/grauph/src/libs/engine/events/DeactivateEvent.h
similarity index 100%
rename from grauph/src/engine/events/DeactivateEvent.h
rename to grauph/src/libs/engine/events/DeactivateEvent.h
diff --git a/grauph/src/engine/events/DestroyEvent.cpp b/grauph/src/libs/engine/events/DestroyEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DestroyEvent.cpp
rename to grauph/src/libs/engine/events/DestroyEvent.cpp
diff --git a/grauph/src/engine/events/DestroyEvent.h b/grauph/src/libs/engine/events/DestroyEvent.h
similarity index 100%
rename from grauph/src/engine/events/DestroyEvent.h
rename to grauph/src/libs/engine/events/DestroyEvent.h
diff --git a/grauph/src/engine/events/DisablePatchEvent.cpp b/grauph/src/libs/engine/events/DisablePatchEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DisablePatchEvent.cpp
rename to grauph/src/libs/engine/events/DisablePatchEvent.cpp
diff --git a/grauph/src/engine/events/DisablePatchEvent.h b/grauph/src/libs/engine/events/DisablePatchEvent.h
similarity index 100%
rename from grauph/src/engine/events/DisablePatchEvent.h
rename to grauph/src/libs/engine/events/DisablePatchEvent.h
diff --git a/grauph/src/engine/events/DisconnectNodeEvent.cpp b/grauph/src/libs/engine/events/DisconnectNodeEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DisconnectNodeEvent.cpp
rename to grauph/src/libs/engine/events/DisconnectNodeEvent.cpp
diff --git a/grauph/src/engine/events/DisconnectNodeEvent.h b/grauph/src/libs/engine/events/DisconnectNodeEvent.h
similarity index 100%
rename from grauph/src/engine/events/DisconnectNodeEvent.h
rename to grauph/src/libs/engine/events/DisconnectNodeEvent.h
diff --git a/grauph/src/engine/events/DisconnectPortEvent.cpp b/grauph/src/libs/engine/events/DisconnectPortEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DisconnectPortEvent.cpp
rename to grauph/src/libs/engine/events/DisconnectPortEvent.cpp
diff --git a/grauph/src/engine/events/DisconnectPortEvent.h b/grauph/src/libs/engine/events/DisconnectPortEvent.h
similarity index 100%
rename from grauph/src/engine/events/DisconnectPortEvent.h
rename to grauph/src/libs/engine/events/DisconnectPortEvent.h
diff --git a/grauph/src/engine/events/DisconnectionEvent.cpp b/grauph/src/libs/engine/events/DisconnectionEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/DisconnectionEvent.cpp
rename to grauph/src/libs/engine/events/DisconnectionEvent.cpp
diff --git a/grauph/src/engine/events/DisconnectionEvent.h b/grauph/src/libs/engine/events/DisconnectionEvent.h
similarity index 100%
rename from grauph/src/engine/events/DisconnectionEvent.h
rename to grauph/src/libs/engine/events/DisconnectionEvent.h
diff --git a/grauph/src/engine/events/EnablePatchEvent.cpp b/grauph/src/libs/engine/events/EnablePatchEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/EnablePatchEvent.cpp
rename to grauph/src/libs/engine/events/EnablePatchEvent.cpp
diff --git a/grauph/src/engine/events/EnablePatchEvent.h b/grauph/src/libs/engine/events/EnablePatchEvent.h
similarity index 100%
rename from grauph/src/engine/events/EnablePatchEvent.h
rename to grauph/src/libs/engine/events/EnablePatchEvent.h
diff --git a/grauph/src/engine/events/LashRestoreDoneEvent.h b/grauph/src/libs/engine/events/LashRestoreDoneEvent.h
similarity index 100%
rename from grauph/src/engine/events/LashRestoreDoneEvent.h
rename to grauph/src/libs/engine/events/LashRestoreDoneEvent.h
diff --git a/grauph/src/engine/events/LoadPluginsEvent.cpp b/grauph/src/libs/engine/events/LoadPluginsEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/LoadPluginsEvent.cpp
rename to grauph/src/libs/engine/events/LoadPluginsEvent.cpp
diff --git a/grauph/src/engine/events/LoadPluginsEvent.h b/grauph/src/libs/engine/events/LoadPluginsEvent.h
similarity index 100%
rename from grauph/src/engine/events/LoadPluginsEvent.h
rename to grauph/src/libs/engine/events/LoadPluginsEvent.h
diff --git a/grauph/src/engine/events/Makefile.am b/grauph/src/libs/engine/events/Makefile.am
similarity index 100%
rename from grauph/src/engine/events/Makefile.am
rename to grauph/src/libs/engine/events/Makefile.am
diff --git a/grauph/src/engine/events/MidiLearnEvent.cpp b/grauph/src/libs/engine/events/MidiLearnEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/MidiLearnEvent.cpp
rename to grauph/src/libs/engine/events/MidiLearnEvent.cpp
diff --git a/grauph/src/engine/events/MidiLearnEvent.h b/grauph/src/libs/engine/events/MidiLearnEvent.h
similarity index 100%
rename from grauph/src/engine/events/MidiLearnEvent.h
rename to grauph/src/libs/engine/events/MidiLearnEvent.h
diff --git a/grauph/src/engine/events/NoteOffEvent.cpp b/grauph/src/libs/engine/events/NoteOffEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/NoteOffEvent.cpp
rename to grauph/src/libs/engine/events/NoteOffEvent.cpp
diff --git a/grauph/src/engine/events/NoteOffEvent.h b/grauph/src/libs/engine/events/NoteOffEvent.h
similarity index 100%
rename from grauph/src/engine/events/NoteOffEvent.h
rename to grauph/src/libs/engine/events/NoteOffEvent.h
diff --git a/grauph/src/engine/events/NoteOnEvent.cpp b/grauph/src/libs/engine/events/NoteOnEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/NoteOnEvent.cpp
rename to grauph/src/libs/engine/events/NoteOnEvent.cpp
diff --git a/grauph/src/engine/events/NoteOnEvent.h b/grauph/src/libs/engine/events/NoteOnEvent.h
similarity index 100%
rename from grauph/src/engine/events/NoteOnEvent.h
rename to grauph/src/libs/engine/events/NoteOnEvent.h
diff --git a/grauph/src/engine/events/PingQueuedEvent.h b/grauph/src/libs/engine/events/PingQueuedEvent.h
similarity index 100%
rename from grauph/src/engine/events/PingQueuedEvent.h
rename to grauph/src/libs/engine/events/PingQueuedEvent.h
diff --git a/grauph/src/engine/events/RegisterClientEvent.cpp b/grauph/src/libs/engine/events/RegisterClientEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/RegisterClientEvent.cpp
rename to grauph/src/libs/engine/events/RegisterClientEvent.cpp
diff --git a/grauph/src/engine/events/RegisterClientEvent.h b/grauph/src/libs/engine/events/RegisterClientEvent.h
similarity index 100%
rename from grauph/src/engine/events/RegisterClientEvent.h
rename to grauph/src/libs/engine/events/RegisterClientEvent.h
diff --git a/grauph/src/engine/events/RenameEvent.cpp b/grauph/src/libs/engine/events/RenameEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/RenameEvent.cpp
rename to grauph/src/libs/engine/events/RenameEvent.cpp
diff --git a/grauph/src/engine/events/RenameEvent.h b/grauph/src/libs/engine/events/RenameEvent.h
similarity index 100%
rename from grauph/src/engine/events/RenameEvent.h
rename to grauph/src/libs/engine/events/RenameEvent.h
diff --git a/grauph/src/engine/events/RequestAllObjectsEvent.cpp b/grauph/src/libs/engine/events/RequestAllObjectsEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/RequestAllObjectsEvent.cpp
rename to grauph/src/libs/engine/events/RequestAllObjectsEvent.cpp
diff --git a/grauph/src/engine/events/RequestAllObjectsEvent.h b/grauph/src/libs/engine/events/RequestAllObjectsEvent.h
similarity index 100%
rename from grauph/src/engine/events/RequestAllObjectsEvent.h
rename to grauph/src/libs/engine/events/RequestAllObjectsEvent.h
diff --git a/grauph/src/engine/events/RequestMetadataEvent.cpp b/grauph/src/libs/engine/events/RequestMetadataEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/RequestMetadataEvent.cpp
rename to grauph/src/libs/engine/events/RequestMetadataEvent.cpp
diff --git a/grauph/src/engine/events/RequestMetadataEvent.h b/grauph/src/libs/engine/events/RequestMetadataEvent.h
similarity index 100%
rename from grauph/src/engine/events/RequestMetadataEvent.h
rename to grauph/src/libs/engine/events/RequestMetadataEvent.h
diff --git a/grauph/src/engine/events/RequestPluginsEvent.cpp b/grauph/src/libs/engine/events/RequestPluginsEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/RequestPluginsEvent.cpp
rename to grauph/src/libs/engine/events/RequestPluginsEvent.cpp
diff --git a/grauph/src/engine/events/RequestPluginsEvent.h b/grauph/src/libs/engine/events/RequestPluginsEvent.h
similarity index 100%
rename from grauph/src/engine/events/RequestPluginsEvent.h
rename to grauph/src/libs/engine/events/RequestPluginsEvent.h
diff --git a/grauph/src/engine/events/RequestPortValueEvent.cpp b/grauph/src/libs/engine/events/RequestPortValueEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/RequestPortValueEvent.cpp
rename to grauph/src/libs/engine/events/RequestPortValueEvent.cpp
diff --git a/grauph/src/engine/events/RequestPortValueEvent.h b/grauph/src/libs/engine/events/RequestPortValueEvent.h
similarity index 100%
rename from grauph/src/engine/events/RequestPortValueEvent.h
rename to grauph/src/libs/engine/events/RequestPortValueEvent.h
diff --git a/grauph/src/engine/events/SetMetadataEvent.cpp b/grauph/src/libs/engine/events/SetMetadataEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/SetMetadataEvent.cpp
rename to grauph/src/libs/engine/events/SetMetadataEvent.cpp
diff --git a/grauph/src/engine/events/SetMetadataEvent.h b/grauph/src/libs/engine/events/SetMetadataEvent.h
similarity index 100%
rename from grauph/src/engine/events/SetMetadataEvent.h
rename to grauph/src/libs/engine/events/SetMetadataEvent.h
diff --git a/grauph/src/engine/events/SetPortValueEvent.cpp b/grauph/src/libs/engine/events/SetPortValueEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/SetPortValueEvent.cpp
rename to grauph/src/libs/engine/events/SetPortValueEvent.cpp
diff --git a/grauph/src/engine/events/SetPortValueEvent.h b/grauph/src/libs/engine/events/SetPortValueEvent.h
similarity index 100%
rename from grauph/src/engine/events/SetPortValueEvent.h
rename to grauph/src/libs/engine/events/SetPortValueEvent.h
diff --git a/grauph/src/engine/events/SetPortValueQueuedEvent.cpp b/grauph/src/libs/engine/events/SetPortValueQueuedEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/SetPortValueQueuedEvent.cpp
rename to grauph/src/libs/engine/events/SetPortValueQueuedEvent.cpp
diff --git a/grauph/src/engine/events/SetPortValueQueuedEvent.h b/grauph/src/libs/engine/events/SetPortValueQueuedEvent.h
similarity index 100%
rename from grauph/src/engine/events/SetPortValueQueuedEvent.h
rename to grauph/src/libs/engine/events/SetPortValueQueuedEvent.h
diff --git a/grauph/src/engine/events/UnregisterClientEvent.cpp b/grauph/src/libs/engine/events/UnregisterClientEvent.cpp
similarity index 100%
rename from grauph/src/engine/events/UnregisterClientEvent.cpp
rename to grauph/src/libs/engine/events/UnregisterClientEvent.cpp
diff --git a/grauph/src/engine/events/UnregisterClientEvent.h b/grauph/src/libs/engine/events/UnregisterClientEvent.h
similarity index 100%
rename from grauph/src/engine/events/UnregisterClientEvent.h
rename to grauph/src/libs/engine/events/UnregisterClientEvent.h
diff --git a/grauph/src/engine/instantiations.cpp b/grauph/src/libs/engine/instantiations.cpp
similarity index 100%
rename from grauph/src/engine/instantiations.cpp
rename to grauph/src/libs/engine/instantiations.cpp
diff --git a/grauph/src/engine/main.cpp b/grauph/src/libs/engine/main.cpp
similarity index 100%
rename from grauph/src/engine/main.cpp
rename to grauph/src/libs/engine/main.cpp
diff --git a/grauph/src/engine/midi.h b/grauph/src/libs/engine/midi.h
similarity index 100%
rename from grauph/src/engine/midi.h
rename to grauph/src/libs/engine/midi.h
diff --git a/grauph/src/engine/tests/Makefile.am b/grauph/src/libs/engine/tests/Makefile.am
similarity index 100%
rename from grauph/src/engine/tests/Makefile.am
rename to grauph/src/libs/engine/tests/Makefile.am
diff --git a/grauph/src/engine/tests/list_test.cpp b/grauph/src/libs/engine/tests/list_test.cpp
similarity index 100%
rename from grauph/src/engine/tests/list_test.cpp
rename to grauph/src/libs/engine/tests/list_test.cpp
diff --git a/grauph/src/engine/tests/node_tree_test.cpp b/grauph/src/libs/engine/tests/node_tree_test.cpp
similarity index 100%
rename from grauph/src/engine/tests/node_tree_test.cpp
rename to grauph/src/libs/engine/tests/node_tree_test.cpp
diff --git a/grauph/src/engine/tests/old_node_tree_test.cpp b/grauph/src/libs/engine/tests/old_node_tree_test.cpp
similarity index 100%
rename from grauph/src/engine/tests/old_node_tree_test.cpp
rename to grauph/src/libs/engine/tests/old_node_tree_test.cpp
diff --git a/grauph/src/engine/tests/queue_test.cpp b/grauph/src/libs/engine/tests/queue_test.cpp
similarity index 100%
rename from grauph/src/engine/tests/queue_test.cpp
rename to grauph/src/libs/engine/tests/queue_test.cpp
diff --git a/grauph/src/engine/tuning.h b/grauph/src/libs/engine/tuning.h
similarity index 100%
rename from grauph/src/engine/tuning.h
rename to grauph/src/libs/engine/tuning.h
diff --git a/grauph/src/engine/util.h b/grauph/src/libs/engine/util.h
similarity index 100%
rename from grauph/src/engine/util.h
rename to grauph/src/libs/engine/util.h
diff --git a/grauph/src/progs/om/Makefile.am b/grauph/src/progs/om/Makefile.am
new file mode 100644
index 00000000..ae0b3e53
--- /dev/null
+++ b/grauph/src/progs/om/Makefile.am
@@ -0,0 +1,259 @@
+SUBDIRS = tests
+DIST_SUBDIRS = events
+
+AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti
+
+MAINTAINERCLEANFILES = Makefile.in
+
+common_SOURCES = \
+	util.h \
+	tuning.h \
+	Node.h \
+	NodeBase.h \
+	NodeBase.cpp \
+	InternalNode.h \
+	Patch.h \
+	Patch.cpp \
+	NodeFactory.h \
+	NodeFactory.cpp \
+	Om.h \
+	Om.cpp \
+	OmApp.h \
+	OmApp.cpp \
+	JackAudioDriver.h \
+	JackAudioDriver.cpp \
+	OSCReceiver.h \
+	OSCReceiver.cpp \
+	Responder.h \
+	OSCResponder.h \
+	OSCResponder.cpp \
+	ClientKey.h \
+	ClientBroadcaster.h \
+	ClientBroadcaster.cpp \
+	ObjectSender.h \
+	ObjectSender.cpp \
+	OSCClient.h \
+	OSCClient.cpp \
+	Buffer.h \
+	Buffer.cpp \
+	Port.h \
+	Port.cpp \
+	PortBase.h \
+	PortBase.cpp \
+	InputPort.h \
+	InputPort.cpp \
+	OutputPort.h \
+	OutputPort.cpp \
+	MidiMessage.h \
+	MidiNoteNode.h \
+	MidiNoteNode.cpp \
+	MidiTriggerNode.h \
+	MidiTriggerNode.cpp \
+	MidiControlNode.h \
+	MidiControlNode.cpp \
+	BridgeNode.h \
+	BridgeNode.cpp \
+	ControlInputNode.h \
+	ControlInputNode.cpp \
+	ControlOutputNode.h \
+	ControlOutputNode.cpp \
+	AudioInputNode.h \
+	AudioInputNode.cpp \
+	AudioOutputNode.h \
+	AudioOutputNode.cpp \
+	MidiInputNode.h \
+	MidiInputNode.cpp \
+	MidiOutputNode.h \
+	MidiOutputNode.cpp \
+	Event.h \
+	Event.cpp \
+	QueuedEvent.h \
+	EventSource.h \
+	QueuedEventSource.h \
+	QueuedEventSource.cpp \
+	QueuedEngineInterface.h \
+	QueuedEngineInterface.cpp \
+	OmObject.h \
+	Maid.h \
+	Maid.cpp \
+	MaidObject.h \
+	Tree.h \
+	ClientRecord.h \
+	PortInfo.h \
+	PluginLibrary.h \
+	Plugin.h \
+	Array.h \
+	List.h \
+	PostProcessor.h \
+	PostProcessor.cpp \
+	Connection.h \
+	Connection.cpp \
+	ConnectionBase.h \
+	ConnectionBase.cpp \
+	ObjectStore.h \
+	ObjectStore.cpp \
+	TransportNode.h \
+	TransportNode.cpp \
+	Driver.h \
+	AudioDriver.h \
+	MidiDriver.h \
+	midi.h \
+	../common/util/Semaphore.h \
+	../common/util/types.h \
+	../common/util/Path.h \
+	../common/util/Queue.h \
+	../common/interface/ClientInterface.h \
+	../common/interface/EngineInterface.h \
+	instantiations.cpp
+
+# Events
+common_SOURCES += \
+	events/RegisterClientEvent.h \
+	events/RegisterClientEvent.cpp \
+	events/UnregisterClientEvent.h \
+	events/UnregisterClientEvent.cpp \
+	events/PingQueuedEvent.h \
+	events/ActivateEvent.h \
+	events/ActivateEvent.cpp \
+	events/DeactivateEvent.h \
+	events/DeactivateEvent.cpp \
+	events/SetPortValueEvent.h \
+	events/SetPortValueEvent.cpp \
+	events/SetPortValueQueuedEvent.h \
+	events/SetPortValueQueuedEvent.cpp \
+	events/NoteOnEvent.h \
+	events/NoteOnEvent.cpp \
+	events/NoteOffEvent.h \
+	events/NoteOffEvent.cpp \
+	events/AllNotesOffEvent.h \
+	events/AllNotesOffEvent.cpp \
+	events/ConnectionEvent.h \
+	events/ConnectionEvent.cpp \
+	events/DisconnectionEvent.h \
+	events/DisconnectionEvent.cpp \
+	events/DisconnectNodeEvent.h \
+	events/DisconnectNodeEvent.cpp \
+	events/DisconnectPortEvent.h \
+	events/DisconnectPortEvent.cpp \
+	events/DestroyEvent.h \
+	events/DestroyEvent.cpp \
+	events/AddNodeEvent.h \
+	events/AddNodeEvent.cpp \
+	events/SetMetadataEvent.h \
+	events/SetMetadataEvent.cpp \
+	events/RequestMetadataEvent.h \
+	events/RequestMetadataEvent.cpp \
+	events/RequestPortValueEvent.h \
+	events/RequestPortValueEvent.cpp \
+	events/RequestAllObjectsEvent.h \
+	events/RequestAllObjectsEvent.cpp \
+	events/RequestPluginsEvent.h \
+	events/RequestPluginsEvent.cpp \
+	events/CreatePatchEvent.h \
+	events/CreatePatchEvent.cpp \
+	events/LoadPluginsEvent.h \
+	events/LoadPluginsEvent.cpp \
+	events/EnablePatchEvent.h \
+	events/EnablePatchEvent.cpp \
+	events/DisablePatchEvent.h \
+	events/DisablePatchEvent.cpp \
+	events/ClearPatchEvent.h \
+	events/ClearPatchEvent.cpp \
+	events/RenameEvent.h \
+	events/RenameEvent.cpp \
+	events/MidiLearnEvent.h \
+	events/MidiLearnEvent.cpp
+
+if WITH_JACK_MIDI
+common_SOURCES += \
+	JackMidiDriver.h \
+	JackMidiDriver.cpp
+endif
+
+if WITH_ALSA_MIDI
+common_SOURCES += \
+	AlsaMidiDriver.h \
+	AlsaMidiDriver.cpp
+endif
+
+if WITH_LADSPA
+common_SOURCES += \
+	LADSPAPlugin.h \
+	LADSPAPlugin.cpp
+endif
+
+if WITH_DSSI
+common_SOURCES += \
+	DSSIPlugin.h \
+	DSSIPlugin.cpp \
+	events/DSSIConfigureEvent.cpp \
+	events/DSSIConfigureEvent.h \
+	events/DSSIControlEvent.cpp \
+	events/DSSIControlEvent.h \
+	events/DSSIProgramEvent.cpp \
+	events/DSSIProgramEvent.h \
+	events/DSSIUpdateEvent.cpp \
+	events/DSSIUpdateEvent.h
+endif
+
+if WITH_LV2
+common_SOURCES += \
+	LV2Plugin.h \
+	LV2Plugin.cpp
+endif
+
+if WITH_LASH
+common_SOURCES += \
+	LashDriver.h \
+	LashDriver.cpp \
+	LashRestoreDoneEvent.h
+endif
+
+
+#
+# Non-installed library to link stand-alone and in-process build against
+#
+
+noinst_LTLIBRARIES = libom.la
+libom_la_SOURCES = $(common_SOURCES)
+
+
+
+#
+# Stand-alone engine
+#
+if BUILD_ENGINE
+
+bin_PROGRAMS = om
+om_DEPENDENCIES = libom.la
+om_LDADD = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt libom.la
+
+om_SOURCES = \
+	main.cpp \
+	cmdline.h \
+	cmdline.c
+
+endif # BUILD_ENGINE
+
+
+
+#
+# Jack internal client
+#
+if BUILD_IN_PROCESS_ENGINE
+
+
+# FIXME: broken
+
+
+# FIXME: Figure out how to get this properly
+omdir = $(prefix)/lib/jack
+
+om_la_CFLAGS = -fPIC
+om_LTLIBRARIES = om.la
+om_la_LDFLAGS = -module -avoid-version @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@
+om_la_SOURCES = OmInProcess.cpp
+
+endif # BUILD_IN_PROCESS_ENGINE
+
+