diff --git a/action/ClassesActionBase.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ClassesActionBase.java
similarity index 100%
rename from action/ClassesActionBase.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ClassesActionBase.java
diff --git a/action/DebuggerTreeAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/DebuggerTreeAction.java
similarity index 100%
rename from action/DebuggerTreeAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/DebuggerTreeAction.java
diff --git a/action/EnableBackgroundTrackingAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/EnableBackgroundTrackingAction.java
similarity index 100%
rename from action/EnableBackgroundTrackingAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/EnableBackgroundTrackingAction.java
diff --git a/action/JumpToTypeSourceAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/JumpToTypeSourceAction.java
similarity index 100%
rename from action/JumpToTypeSourceAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/JumpToTypeSourceAction.java
diff --git a/action/ShowClassesWithDiffAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowClassesWithDiffAction.java
similarity index 100%
rename from action/ShowClassesWithDiffAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowClassesWithDiffAction.java
diff --git a/action/ShowClassesWithInstanceAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowClassesWithInstanceAction.java
similarity index 100%
rename from action/ShowClassesWithInstanceAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowClassesWithInstanceAction.java
diff --git a/action/ShowInstancesAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowInstancesAction.java
similarity index 100%
rename from action/ShowInstancesAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowInstancesAction.java
diff --git a/action/ShowInstancesByClassAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowInstancesByClassAction.java
similarity index 100%
rename from action/ShowInstancesByClassAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowInstancesByClassAction.java
diff --git a/action/ShowInstancesFromClassesViewAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowInstancesFromClassesViewAction.java
similarity index 100%
rename from action/ShowInstancesFromClassesViewAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowInstancesFromClassesViewAction.java
diff --git a/action/ShowNewInstancesAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowNewInstancesAction.java
similarity index 100%
rename from action/ShowNewInstancesAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowNewInstancesAction.java
diff --git a/action/ShowTrackedAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/ShowTrackedAction.java
similarity index 100%
rename from action/ShowTrackedAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/ShowTrackedAction.java
diff --git a/action/tracking/JumpToAllocationSourceAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/tracking/JumpToAllocationSourceAction.java
similarity index 100%
rename from action/tracking/JumpToAllocationSourceAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/tracking/JumpToAllocationSourceAction.java
diff --git a/action/tracking/TrackInstancesToggleAction.java b/java/debugger/impl/src/com/intellij/debugger/memory/action/tracking/TrackInstancesToggleAction.java
similarity index 100%
rename from action/tracking/TrackInstancesToggleAction.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/action/tracking/TrackInstancesToggleAction.java
diff --git a/component/CreationPositionTracker.java b/java/debugger/impl/src/com/intellij/debugger/memory/component/CreationPositionTracker.java
similarity index 100%
rename from component/CreationPositionTracker.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/component/CreationPositionTracker.java
diff --git a/component/InstancesTracker.java b/java/debugger/impl/src/com/intellij/debugger/memory/component/InstancesTracker.java
similarity index 100%
rename from component/InstancesTracker.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/component/InstancesTracker.java
diff --git a/component/MemoryViewManager.java b/java/debugger/impl/src/com/intellij/debugger/memory/component/MemoryViewManager.java
similarity index 100%
rename from component/MemoryViewManager.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/component/MemoryViewManager.java
diff --git a/component/MemoryViewManagerState.java b/java/debugger/impl/src/com/intellij/debugger/memory/component/MemoryViewManagerState.java
similarity index 100%
rename from component/MemoryViewManagerState.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/component/MemoryViewManagerState.java
diff --git a/event/InstancesTrackerListener.java b/java/debugger/impl/src/com/intellij/debugger/memory/event/InstancesTrackerListener.java
similarity index 100%
rename from event/InstancesTrackerListener.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/event/InstancesTrackerListener.java
diff --git a/event/MemoryViewManagerListener.java b/java/debugger/impl/src/com/intellij/debugger/memory/event/MemoryViewManagerListener.java
similarity index 100%
rename from event/MemoryViewManagerListener.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/event/MemoryViewManagerListener.java
diff --git a/sizeof/RetainedSizeFetcher.java b/java/debugger/impl/src/com/intellij/debugger/memory/sizeof/RetainedSizeFetcher.java
similarity index 100%
rename from sizeof/RetainedSizeFetcher.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/sizeof/RetainedSizeFetcher.java
diff --git a/sizeof/SizeOfEvalStrategy.java b/java/debugger/impl/src/com/intellij/debugger/memory/sizeof/SizeOfEvalStrategy.java
similarity index 100%
rename from sizeof/SizeOfEvalStrategy.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/sizeof/SizeOfEvalStrategy.java
diff --git a/toolwindow/MemoryViewToolWindowFactory.java b/java/debugger/impl/src/com/intellij/debugger/memory/toolwindow/MemoryViewToolWindowFactory.java
similarity index 100%
rename from toolwindow/MemoryViewToolWindowFactory.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/toolwindow/MemoryViewToolWindowFactory.java
diff --git a/tracking/BackgroundTracker.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/BackgroundTracker.java
similarity index 100%
rename from tracking/BackgroundTracker.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/BackgroundTracker.java
diff --git a/tracking/ClassPreparedListener.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/ClassPreparedListener.java
similarity index 100%
rename from tracking/ClassPreparedListener.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/ClassPreparedListener.java
diff --git a/tracking/ConstructorInstancesTracker.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/ConstructorInstancesTracker.java
similarity index 100%
rename from tracking/ConstructorInstancesTracker.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/ConstructorInstancesTracker.java
diff --git a/tracking/HashBasedTracking.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/HashBasedTracking.java
similarity index 100%
rename from tracking/HashBasedTracking.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/HashBasedTracking.java
diff --git a/tracking/IdentityBasedTracking.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/IdentityBasedTracking.java
similarity index 100%
rename from tracking/IdentityBasedTracking.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/IdentityBasedTracking.java
diff --git a/tracking/InstanceTrackingStrategy.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/InstanceTrackingStrategy.java
similarity index 100%
rename from tracking/InstanceTrackingStrategy.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/InstanceTrackingStrategy.java
diff --git a/tracking/RetainReferencesTracking.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/RetainReferencesTracking.java
similarity index 100%
rename from tracking/RetainReferencesTracking.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/RetainReferencesTracking.java
diff --git a/tracking/TrackerForNewInstances.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/TrackerForNewInstances.java
similarity index 100%
rename from tracking/TrackerForNewInstances.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/TrackerForNewInstances.java
diff --git a/tracking/TrackingType.java b/java/debugger/impl/src/com/intellij/debugger/memory/tracking/TrackingType.java
similarity index 100%
rename from tracking/TrackingType.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/tracking/TrackingType.java
diff --git a/utils/AbstractTableColumnDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/AbstractTableColumnDescriptor.java
similarity index 100%
rename from utils/AbstractTableColumnDescriptor.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/AbstractTableColumnDescriptor.java
diff --git a/utils/AbstractTableModelWithColumns.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/AbstractTableModelWithColumns.java
similarity index 100%
rename from utils/AbstractTableModelWithColumns.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/AbstractTableModelWithColumns.java
diff --git a/utils/AndroidUtil.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/AndroidUtil.java
similarity index 100%
rename from utils/AndroidUtil.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/AndroidUtil.java
diff --git a/utils/ErrorsValueGroup.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/ErrorsValueGroup.java
similarity index 100%
rename from utils/ErrorsValueGroup.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/ErrorsValueGroup.java
diff --git a/utils/InstanceJavaValue.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/InstanceJavaValue.java
similarity index 100%
rename from utils/InstanceJavaValue.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/InstanceJavaValue.java
diff --git a/utils/InstanceValueDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/InstanceValueDescriptor.java
similarity index 100%
rename from utils/InstanceValueDescriptor.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/InstanceValueDescriptor.java
diff --git a/utils/InstancesProvider.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/InstancesProvider.java
similarity index 100%
rename from utils/InstancesProvider.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/InstancesProvider.java
diff --git a/utils/KeyboardUtils.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/KeyboardUtils.java
similarity index 100%
rename from utils/KeyboardUtils.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/KeyboardUtils.java
diff --git a/utils/LowestPriorityCommand.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/LowestPriorityCommand.java
similarity index 100%
rename from utils/LowestPriorityCommand.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/LowestPriorityCommand.java
diff --git a/utils/NamesUtils.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/NamesUtils.java
similarity index 100%
rename from utils/NamesUtils.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/NamesUtils.java
diff --git a/utils/SingleAlarmWithMutableDelay.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/SingleAlarmWithMutableDelay.java
similarity index 100%
rename from utils/SingleAlarmWithMutableDelay.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/SingleAlarmWithMutableDelay.java
diff --git a/utils/StackFrameDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/memory/utils/StackFrameDescriptor.java
similarity index 100%
rename from utils/StackFrameDescriptor.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/utils/StackFrameDescriptor.java
diff --git a/view/ClassesFilteredView.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/ClassesFilteredView.java
similarity index 100%
rename from view/ClassesFilteredView.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/ClassesFilteredView.java
diff --git a/view/ClassesTable.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/ClassesTable.java
similarity index 100%
rename from view/ClassesTable.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/ClassesTable.java
diff --git a/view/ExpressionEditorWithHistory.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/ExpressionEditorWithHistory.java
similarity index 100%
rename from view/ExpressionEditorWithHistory.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/ExpressionEditorWithHistory.java
diff --git a/view/FilteringProgressView.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/FilteringProgressView.java
similarity index 100%
rename from view/FilteringProgressView.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/FilteringProgressView.java
diff --git a/view/InstancesTree.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/InstancesTree.java
similarity index 100%
rename from view/InstancesTree.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/InstancesTree.java
diff --git a/view/InstancesWindow.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/InstancesWindow.java
similarity index 100%
rename from view/InstancesWindow.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/InstancesWindow.java
diff --git a/view/InstancesWithStackFrameView.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/InstancesWithStackFrameView.java
similarity index 100%
rename from view/InstancesWithStackFrameView.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/InstancesWithStackFrameView.java
diff --git a/view/StackFrameList.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/StackFrameList.java
similarity index 100%
rename from view/StackFrameList.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/StackFrameList.java
diff --git a/view/StackFramePopup.java b/java/debugger/impl/src/com/intellij/debugger/memory/view/StackFramePopup.java
similarity index 100%
rename from view/StackFramePopup.java
rename to java/debugger/impl/src/com/intellij/debugger/memory/view/StackFramePopup.java