From f87836aa5e4786e4defe9c4d63250a7ad8f1ad65 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Fri, 2 Jul 2004 19:30:18 +0000
Subject: [PATCH] 2004-07-02 Alain Magloire

	Move the CDI interface to its own source browser and library
	* cdi/*
---
 debug/org.eclipse.cdt.debug.core/.classpath                | 1 +
 debug/org.eclipse.cdt.debug.core/ChangeLog                 | 5 +++++
 debug/org.eclipse.cdt.debug.core/build.properties          | 7 ++++++-
 .../org/eclipse/cdt/debug/core/cdi/CDIException.java       | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java  | 0
 .../eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java  | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java     | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDICondition.java      | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java  | 0
 .../eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java   | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java      | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java   | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java       | 0
 .../eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java  | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIFormat.java         | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDILocation.java       | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIManager.java        | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java  | 0
 .../eclipse/cdt/debug/core/cdi/ICDIRegisterManager.java    | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDISession.java        | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java  | 0
 .../eclipse/cdt/debug/core/cdi/ICDISharedLibraryEvent.java | 0
 .../cdt/debug/core/cdi/ICDISharedLibraryManager.java       | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDISignalExitInfo.java | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java  | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java  | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java   | 0
 .../org/eclipse/cdt/debug/core/cdi/ICDITraceSnapshot.java  | 0
 .../eclipse/cdt/debug/core/cdi/ICDIVariableManager.java    | 0
 .../eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java    | 0
 .../eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java  | 0
 .../eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java | 0
 .../eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java | 0
 .../cdt/debug/core/cdi/event/ICDIDestroyedEvent.java       | 0
 .../cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java    | 0
 .../org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java    | 0
 .../cdt/debug/core/cdi/event/ICDIEventListener.java        | 0
 .../eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java  | 0
 .../cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java   | 0
 .../cdt/debug/core/cdi/event/ICDIRestartedEvent.java       | 0
 .../eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java | 0
 .../cdt/debug/core/cdi/event/ICDISuspendedEvent.java       | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java | 0
 .../cdt/debug/core/cdi/model/ICDIArgumentObject.java       | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java   | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java   | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDIExpression.java   | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java  | 0
 .../cdt/debug/core/cdi/model/ICDILocationBreakpoint.java   | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java  | 0
 .../cdt/debug/core/cdi/model/ICDIMixedInstruction.java     | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java   | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java | 0
 .../cdt/debug/core/cdi/model/ICDIRegisterGroup.java        | 0
 .../cdt/debug/core/cdi/model/ICDIRegisterObject.java       | 0
 .../cdt/debug/core/cdi/model/ICDISharedLibrary.java        | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java   | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java   | 0
 .../cdt/debug/core/cdi/model/ICDIStaticVariable.java       | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java   | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java   | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDITracepoint.java   | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java    | 0
 .../org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java | 0
 .../cdt/debug/core/cdi/model/ICDIVariableObject.java       | 0
 .../eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java   | 0
 68 files changed, 12 insertions(+), 1 deletion(-)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/CDIException.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDICondition.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIFormat.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDILocation.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIRegisterManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISession.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISignalExitInfo.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDITraceSnapshot.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIVariableManager.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIArgumentObject.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterObject.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDITracepoint.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java (100%)
 rename debug/org.eclipse.cdt.debug.core/{src => cdi}/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java (100%)

diff --git a/debug/org.eclipse.cdt.debug.core/.classpath b/debug/org.eclipse.cdt.debug.core/.classpath
index 5e28d3dce23..d7c332af536 100644
--- a/debug/org.eclipse.cdt.debug.core/.classpath
+++ b/debug/org.eclipse.cdt.debug.core/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="cdi"/>
 	<classpathentry kind="src" path="schema"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index d7a18150eeb..6b5466df96b 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-02 Alain Magloire
+
+	Move the CDI interface to its own source browser and library
+	* cdi/*
+
 2004-06-29 Alain Magloire
 
 	Do not use the cache stackframe.
diff --git a/debug/org.eclipse.cdt.debug.core/build.properties b/debug/org.eclipse.cdt.debug.core/build.properties
index 8c4c90c03a4..358983f1da7 100644
--- a/debug/org.eclipse.cdt.debug.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.core/build.properties
@@ -12,11 +12,16 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtdebugcore.jar
+               cdtdebugcore.jar,\
+               cdi.jar
 source.cdtdebugcore.jar = src,\
+                          cdi,\
                           schema
 javadoc.packages = org.eclipse.cdt.debug.core.*,\
                    org.eclipse.cdt.debug.core.cdi.*,\
                    org.eclipse.cdt.debug.core.cdi.event.*,\
                    org.eclipse.cdt.debug.core.cdi.model.*
 src.includes = schema/
+jars.compile.order = cdi.jar
+source.cdi.jar = cdi/
+output.cdi.jar = bin/
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/CDIException.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/CDIException.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/CDIException.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointHit.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIBreakpointManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDICatchEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDICondition.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDICondition.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDICondition.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIConfiguration.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIEndSteppingRange.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIErrorInfo.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIEventManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIExitInfo.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIFormat.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIFormat.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIFormat.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIFormat.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocation.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDILocation.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDILocation.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDILocation.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRegisterManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRegisterManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRegisterManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRegisterManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISessionObject.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalExitInfo.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalExitInfo.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalExitInfo.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalExitInfo.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDITraceManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDITraceSnapshot.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDITraceSnapshot.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDITraceSnapshot.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDITraceSnapshot.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIVariableManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIVariableManager.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIVariableManager.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIVariableManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointScope.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIWatchpointTrigger.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIChangedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDICreatedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIDestroyedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIDisconnectedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIEventListener.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIExitedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIMemoryChangedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIRestartedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgument.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgumentObject.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgumentObject.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIArgumentObject.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIArgumentObject.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIBreakpoint.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDICatchpoint.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIInstruction.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDILocationBreakpoint.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMixedInstruction.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIObject.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRegister.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterGroup.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterObject.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterObject.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterObject.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRegisterObject.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibrary.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIStackFrame.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIStaticVariable.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITracepoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITracepoint.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITracepoint.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITracepoint.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIValue.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java
similarity index 100%
rename from debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIWatchpoint.java