diff --git a/src/copy/createRequest.h b/src/copy/pv/createRequest.h
similarity index 100%
rename from src/copy/createRequest.h
rename to src/copy/pv/createRequest.h
diff --git a/src/copy/pvCopy.h b/src/copy/pv/pvCopy.h
similarity index 100%
rename from src/copy/pvCopy.h
rename to src/copy/pv/pvCopy.h
diff --git a/src/factory/factory.h b/src/factory/pv/factory.h
similarity index 100%
rename from src/factory/factory.h
rename to src/factory/pv/factory.h
diff --git a/src/misc/bitSet.h b/src/misc/pv/bitSet.h
similarity index 100%
rename from src/misc/bitSet.h
rename to src/misc/pv/bitSet.h
diff --git a/src/misc/byteBuffer.h b/src/misc/pv/byteBuffer.h
similarity index 100%
rename from src/misc/byteBuffer.h
rename to src/misc/pv/byteBuffer.h
diff --git a/src/misc/current_function.h b/src/misc/pv/current_function.h
similarity index 100%
rename from src/misc/current_function.h
rename to src/misc/pv/current_function.h
diff --git a/src/misc/destroyable.h b/src/misc/pv/destroyable.h
similarity index 100%
rename from src/misc/destroyable.h
rename to src/misc/pv/destroyable.h
diff --git a/src/misc/epicsException.h b/src/misc/pv/epicsException.h
similarity index 100%
rename from src/misc/epicsException.h
rename to src/misc/pv/epicsException.h
diff --git a/src/misc/event.h b/src/misc/pv/event.h
similarity index 100%
rename from src/misc/event.h
rename to src/misc/pv/event.h
diff --git a/src/misc/executor.h b/src/misc/pv/executor.h
similarity index 100%
rename from src/misc/executor.h
rename to src/misc/pv/executor.h
diff --git a/src/misc/localStaticLock.h b/src/misc/pv/localStaticLock.h
similarity index 100%
rename from src/misc/localStaticLock.h
rename to src/misc/pv/localStaticLock.h
diff --git a/src/misc/lock.h b/src/misc/pv/lock.h
similarity index 100%
rename from src/misc/lock.h
rename to src/misc/pv/lock.h
diff --git a/src/misc/messageQueue.h b/src/misc/pv/messageQueue.h
similarity index 100%
rename from src/misc/messageQueue.h
rename to src/misc/pv/messageQueue.h
diff --git a/src/misc/noDefaultMethods.h b/src/misc/pv/noDefaultMethods.h
similarity index 100%
rename from src/misc/noDefaultMethods.h
rename to src/misc/pv/noDefaultMethods.h
diff --git a/src/misc/queue.h b/src/misc/pv/queue.h
similarity index 100%
rename from src/misc/queue.h
rename to src/misc/pv/queue.h
diff --git a/src/misc/requester.h b/src/misc/pv/requester.h
similarity index 100%
rename from src/misc/requester.h
rename to src/misc/pv/requester.h
diff --git a/src/misc/serialize.h b/src/misc/pv/serialize.h
similarity index 100%
rename from src/misc/serialize.h
rename to src/misc/pv/serialize.h
diff --git a/src/misc/serializeHelper.h b/src/misc/pv/serializeHelper.h
similarity index 100%
rename from src/misc/serializeHelper.h
rename to src/misc/pv/serializeHelper.h
diff --git a/src/misc/sharedPtr.h b/src/misc/pv/sharedPtr.h
similarity index 100%
rename from src/misc/sharedPtr.h
rename to src/misc/pv/sharedPtr.h
diff --git a/src/misc/sharedVector.h b/src/misc/pv/sharedVector.h
similarity index 100%
rename from src/misc/sharedVector.h
rename to src/misc/pv/sharedVector.h
diff --git a/src/misc/status.h b/src/misc/pv/status.h
similarity index 100%
rename from src/misc/status.h
rename to src/misc/pv/status.h
diff --git a/src/misc/templateMeta.h b/src/misc/pv/templateMeta.h
similarity index 100%
rename from src/misc/templateMeta.h
rename to src/misc/pv/templateMeta.h
diff --git a/src/misc/thread.h b/src/misc/pv/thread.h
similarity index 100%
rename from src/misc/thread.h
rename to src/misc/pv/thread.h
diff --git a/src/misc/timeFunction.h b/src/misc/pv/timeFunction.h
similarity index 100%
rename from src/misc/timeFunction.h
rename to src/misc/pv/timeFunction.h
diff --git a/src/misc/timer.h b/src/misc/pv/timer.h
similarity index 100%
rename from src/misc/timer.h
rename to src/misc/pv/timer.h
diff --git a/src/misc/typeCast.h b/src/misc/pv/typeCast.h
similarity index 100%
rename from src/misc/typeCast.h
rename to src/misc/pv/typeCast.h
diff --git a/src/monitor/monitor.h b/src/monitor/pv/monitor.h
similarity index 100%
rename from src/monitor/monitor.h
rename to src/monitor/pv/monitor.h
diff --git a/src/monitor/monitorPlugin.h b/src/monitor/pv/monitorPlugin.h
similarity index 100%
rename from src/monitor/monitorPlugin.h
rename to src/monitor/pv/monitorPlugin.h
diff --git a/src/property/alarm.h b/src/property/pv/alarm.h
similarity index 100%
rename from src/property/alarm.h
rename to src/property/pv/alarm.h
diff --git a/src/property/control.h b/src/property/pv/control.h
similarity index 100%
rename from src/property/control.h
rename to src/property/pv/control.h
diff --git a/src/property/display.h b/src/property/pv/display.h
similarity index 100%
rename from src/property/display.h
rename to src/property/pv/display.h
diff --git a/src/property/pvAlarm.h b/src/property/pv/pvAlarm.h
similarity index 100%
rename from src/property/pvAlarm.h
rename to src/property/pv/pvAlarm.h
diff --git a/src/property/pvControl.h b/src/property/pv/pvControl.h
similarity index 100%
rename from src/property/pvControl.h
rename to src/property/pv/pvControl.h
diff --git a/src/property/pvDisplay.h b/src/property/pv/pvDisplay.h
similarity index 100%
rename from src/property/pvDisplay.h
rename to src/property/pv/pvDisplay.h
diff --git a/src/property/pvEnumerated.h b/src/property/pv/pvEnumerated.h
similarity index 100%
rename from src/property/pvEnumerated.h
rename to src/property/pv/pvEnumerated.h
diff --git a/src/property/pvTimeStamp.h b/src/property/pv/pvTimeStamp.h
similarity index 100%
rename from src/property/pvTimeStamp.h
rename to src/property/pv/pvTimeStamp.h
diff --git a/src/property/timeStamp.h b/src/property/pv/timeStamp.h
similarity index 100%
rename from src/property/timeStamp.h
rename to src/property/pv/timeStamp.h
diff --git a/src/pvMisc/bitSetUtil.h b/src/pvMisc/pv/bitSetUtil.h
similarity index 100%
rename from src/pvMisc/bitSetUtil.h
rename to src/pvMisc/pv/bitSetUtil.h
diff --git a/testApp/rtemsNetworking.h b/testApp/pv/rtemsNetworking.h
similarity index 100%
rename from testApp/rtemsNetworking.h
rename to testApp/pv/rtemsNetworking.h