diff --git a/Modules/IGT/IGTTrackingDevices/CMakeLists.txt b/Modules/IGT/TrackingDevices/CMakeLists.txt similarity index 100% rename from Modules/IGT/IGTTrackingDevices/CMakeLists.txt rename to Modules/IGT/TrackingDevices/CMakeLists.txt diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/ClaronMicron.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/ClaronMicron.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/ClaronMicron.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/ClaronMicron.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/IntuitiveDaVinci.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/IntuitiveDaVinci.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/IntuitiveDaVinci.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/IntuitiveDaVinci.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAurora.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAurora.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAurora.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAurora.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraCompactFG_Dome.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraCompactFG_Dome.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraCompactFG_Dome.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraCompactFG_Dome.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraPlanarFG_Dome.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Dome.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Dome.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Dome.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Dome.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Prototype_Dome.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Prototype_Dome.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Prototype_Dome.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAuroraTabletopFG_Prototype_Dome.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAurora_Dome.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAurora_Dome.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIAurora_Dome.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIAurora_Dome.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIPolaris.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIPolaris.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIPolaris.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIPolaris.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIPolarisVicra.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/NDIPolarisVicra.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/NDIPolarisVicra.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/NDIPolarisVicra.stl diff --git a/Modules/IGT/IGTTrackingDevices/TrackingVolumeData/StandardVolume.stl b/Modules/IGT/TrackingDevices/TrackingVolumeData/StandardVolume.stl similarity index 100% rename from Modules/IGT/IGTTrackingDevices/TrackingVolumeData/StandardVolume.stl rename to Modules/IGT/TrackingDevices/TrackingVolumeData/StandardVolume.stl diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronInterface.cpp b/Modules/IGT/TrackingDevices/mitkClaronInterface.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronInterface.cpp rename to Modules/IGT/TrackingDevices/mitkClaronInterface.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronInterface.h b/Modules/IGT/TrackingDevices/mitkClaronInterface.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronInterface.h rename to Modules/IGT/TrackingDevices/mitkClaronInterface.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronInterfaceStub.cpp b/Modules/IGT/TrackingDevices/mitkClaronInterfaceStub.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronInterfaceStub.cpp rename to Modules/IGT/TrackingDevices/mitkClaronInterfaceStub.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronInterfaceStub.h b/Modules/IGT/TrackingDevices/mitkClaronInterfaceStub.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronInterfaceStub.h rename to Modules/IGT/TrackingDevices/mitkClaronInterfaceStub.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronTool.cpp b/Modules/IGT/TrackingDevices/mitkClaronTool.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronTool.cpp rename to Modules/IGT/TrackingDevices/mitkClaronTool.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronTool.h b/Modules/IGT/TrackingDevices/mitkClaronTool.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronTool.h rename to Modules/IGT/TrackingDevices/mitkClaronTool.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronTrackingDevice.cpp b/Modules/IGT/TrackingDevices/mitkClaronTrackingDevice.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronTrackingDevice.cpp rename to Modules/IGT/TrackingDevices/mitkClaronTrackingDevice.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkClaronTrackingDevice.h b/Modules/IGT/TrackingDevices/mitkClaronTrackingDevice.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkClaronTrackingDevice.h rename to Modules/IGT/TrackingDevices/mitkClaronTrackingDevice.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkInternalTrackingTool.cpp b/Modules/IGT/TrackingDevices/mitkInternalTrackingTool.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkInternalTrackingTool.cpp rename to Modules/IGT/TrackingDevices/mitkInternalTrackingTool.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkInternalTrackingTool.h b/Modules/IGT/TrackingDevices/mitkInternalTrackingTool.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkInternalTrackingTool.h rename to Modules/IGT/TrackingDevices/mitkInternalTrackingTool.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkItkNonUniformBSpline.h b/Modules/IGT/TrackingDevices/mitkItkNonUniformBSpline.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkItkNonUniformBSpline.h rename to Modules/IGT/TrackingDevices/mitkItkNonUniformBSpline.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkItkNonUniformBSpline.txx b/Modules/IGT/TrackingDevices/mitkItkNonUniformBSpline.txx similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkItkNonUniformBSpline.txx rename to Modules/IGT/TrackingDevices/mitkItkNonUniformBSpline.txx diff --git a/Modules/IGT/IGTTrackingDevices/mitkMicroBirdTool.cpp b/Modules/IGT/TrackingDevices/mitkMicroBirdTool.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkMicroBirdTool.cpp rename to Modules/IGT/TrackingDevices/mitkMicroBirdTool.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkMicroBirdTool.h b/Modules/IGT/TrackingDevices/mitkMicroBirdTool.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkMicroBirdTool.h rename to Modules/IGT/TrackingDevices/mitkMicroBirdTool.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkMicroBirdTrackingDevice.cpp b/Modules/IGT/TrackingDevices/mitkMicroBirdTrackingDevice.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkMicroBirdTrackingDevice.cpp rename to Modules/IGT/TrackingDevices/mitkMicroBirdTrackingDevice.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkMicroBirdTrackingDevice.h b/Modules/IGT/TrackingDevices/mitkMicroBirdTrackingDevice.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkMicroBirdTrackingDevice.h rename to Modules/IGT/TrackingDevices/mitkMicroBirdTrackingDevice.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkNDIPassiveTool.cpp b/Modules/IGT/TrackingDevices/mitkNDIPassiveTool.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkNDIPassiveTool.cpp rename to Modules/IGT/TrackingDevices/mitkNDIPassiveTool.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkNDIPassiveTool.h b/Modules/IGT/TrackingDevices/mitkNDIPassiveTool.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkNDIPassiveTool.h rename to Modules/IGT/TrackingDevices/mitkNDIPassiveTool.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkNDIProtocol.cpp b/Modules/IGT/TrackingDevices/mitkNDIProtocol.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkNDIProtocol.cpp rename to Modules/IGT/TrackingDevices/mitkNDIProtocol.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkNDIProtocol.h b/Modules/IGT/TrackingDevices/mitkNDIProtocol.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkNDIProtocol.h rename to Modules/IGT/TrackingDevices/mitkNDIProtocol.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.cpp b/Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.cpp rename to Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.h b/Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkNDITrackingDevice.h rename to Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkSerialCommunication.cpp b/Modules/IGT/TrackingDevices/mitkSerialCommunication.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkSerialCommunication.cpp rename to Modules/IGT/TrackingDevices/mitkSerialCommunication.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkSerialCommunication.h b/Modules/IGT/TrackingDevices/mitkSerialCommunication.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkSerialCommunication.h rename to Modules/IGT/TrackingDevices/mitkSerialCommunication.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkSerialCommunicationTest.cpp b/Modules/IGT/TrackingDevices/mitkSerialCommunicationTest.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkSerialCommunicationTest.cpp rename to Modules/IGT/TrackingDevices/mitkSerialCommunicationTest.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.cpp b/Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.cpp rename to Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.h b/Modules/IGT/TrackingDevices/mitkTrackingDevice.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkTrackingDevice.h rename to Modules/IGT/TrackingDevices/mitkTrackingDevice.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkTrackingTool.cpp b/Modules/IGT/TrackingDevices/mitkTrackingTool.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkTrackingTool.cpp rename to Modules/IGT/TrackingDevices/mitkTrackingTool.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkTrackingTool.h b/Modules/IGT/TrackingDevices/mitkTrackingTool.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkTrackingTool.h rename to Modules/IGT/TrackingDevices/mitkTrackingTool.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkTrackingTypes.h b/Modules/IGT/TrackingDevices/mitkTrackingTypes.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkTrackingTypes.h rename to Modules/IGT/TrackingDevices/mitkTrackingTypes.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingDevice.cpp b/Modules/IGT/TrackingDevices/mitkVirtualTrackingDevice.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingDevice.cpp rename to Modules/IGT/TrackingDevices/mitkVirtualTrackingDevice.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingDevice.h b/Modules/IGT/TrackingDevices/mitkVirtualTrackingDevice.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingDevice.h rename to Modules/IGT/TrackingDevices/mitkVirtualTrackingDevice.h diff --git a/Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingTool.cpp b/Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.cpp similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingTool.cpp rename to Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.cpp diff --git a/Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingTool.h b/Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.h similarity index 100% rename from Modules/IGT/IGTTrackingDevices/mitkVirtualTrackingTool.h rename to Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.h