diff --git a/src/ca/caChannel.h b/src/ca/pv/caChannel.h
similarity index 100%
rename from src/ca/caChannel.h
rename to src/ca/pv/caChannel.h
diff --git a/src/ca/caProvider.h b/src/ca/pv/caProvider.h
similarity index 100%
rename from src/ca/caProvider.h
rename to src/ca/pv/caProvider.h
diff --git a/src/ca/caStatus.h b/src/ca/pv/caStatus.h
similarity index 100%
rename from src/ca/caStatus.h
rename to src/ca/pv/caStatus.h
diff --git a/src/client/pvAccess.h b/src/client/pv/pvAccess.h
similarity index 100%
rename from src/client/pvAccess.h
rename to src/client/pv/pvAccess.h
diff --git a/src/ioc/syncChannelFind.h b/src/ioc/pv/syncChannelFind.h
similarity index 100%
rename from src/ioc/syncChannelFind.h
rename to src/ioc/pv/syncChannelFind.h
diff --git a/src/mb/pvAccessMB.h b/src/mb/pv/pvAccessMB.h
similarity index 100%
rename from src/mb/pvAccessMB.h
rename to src/mb/pv/pvAccessMB.h
diff --git a/src/pipelineService/pipelineServer.h b/src/pipelineService/pv/pipelineServer.h
similarity index 100%
rename from src/pipelineService/pipelineServer.h
rename to src/pipelineService/pv/pipelineServer.h
diff --git a/src/pipelineService/pipelineService.h b/src/pipelineService/pv/pipelineService.h
similarity index 100%
rename from src/pipelineService/pipelineService.h
rename to src/pipelineService/pv/pipelineService.h
diff --git a/src/pva/clientFactory.h b/src/pva/pv/clientFactory.h
similarity index 100%
rename from src/pva/clientFactory.h
rename to src/pva/pv/clientFactory.h
diff --git a/src/pva/pvaConstants.h b/src/pva/pv/pvaConstants.h
similarity index 100%
rename from src/pva/pvaConstants.h
rename to src/pva/pv/pvaConstants.h
diff --git a/src/pva/pvaVersion.h b/src/pva/pv/pvaVersion.h
similarity index 100%
rename from src/pva/pvaVersion.h
rename to src/pva/pv/pvaVersion.h
diff --git a/src/remote/beaconHandler.h b/src/remote/pv/beaconHandler.h
similarity index 100%
rename from src/remote/beaconHandler.h
rename to src/remote/pv/beaconHandler.h
diff --git a/src/remote/blockingTCP.h b/src/remote/pv/blockingTCP.h
similarity index 100%
rename from src/remote/blockingTCP.h
rename to src/remote/pv/blockingTCP.h
diff --git a/src/remote/blockingUDP.h b/src/remote/pv/blockingUDP.h
similarity index 100%
rename from src/remote/blockingUDP.h
rename to src/remote/pv/blockingUDP.h
diff --git a/src/remote/channelSearchManager.h b/src/remote/pv/channelSearchManager.h
similarity index 100%
rename from src/remote/channelSearchManager.h
rename to src/remote/pv/channelSearchManager.h
diff --git a/src/remote/codec.h b/src/remote/pv/codec.h
similarity index 100%
rename from src/remote/codec.h
rename to src/remote/pv/codec.h
diff --git a/src/remote/remote.h b/src/remote/pv/remote.h
similarity index 100%
rename from src/remote/remote.h
rename to src/remote/pv/remote.h
diff --git a/src/remote/security.h b/src/remote/pv/security.h
similarity index 100%
rename from src/remote/security.h
rename to src/remote/pv/security.h
diff --git a/src/remote/serializationHelper.h b/src/remote/pv/serializationHelper.h
similarity index 100%
rename from src/remote/serializationHelper.h
rename to src/remote/pv/serializationHelper.h
diff --git a/src/remote/simpleChannelSearchManagerImpl.h b/src/remote/pv/simpleChannelSearchManagerImpl.h
similarity index 100%
rename from src/remote/simpleChannelSearchManagerImpl.h
rename to src/remote/pv/simpleChannelSearchManagerImpl.h
diff --git a/src/remote/transportRegistry.h b/src/remote/pv/transportRegistry.h
similarity index 100%
rename from src/remote/transportRegistry.h
rename to src/remote/pv/transportRegistry.h
diff --git a/src/remoteClient/clientContextImpl.h b/src/remoteClient/pv/clientContextImpl.h
similarity index 100%
rename from src/remoteClient/clientContextImpl.h
rename to src/remoteClient/pv/clientContextImpl.h
diff --git a/src/rpcClient/rpcClient.h b/src/rpcClient/pv/rpcClient.h
similarity index 100%
rename from src/rpcClient/rpcClient.h
rename to src/rpcClient/pv/rpcClient.h
diff --git a/src/rpcService/rpcServer.h b/src/rpcService/pv/rpcServer.h
similarity index 100%
rename from src/rpcService/rpcServer.h
rename to src/rpcService/pv/rpcServer.h
diff --git a/src/rpcService/rpcService.h b/src/rpcService/pv/rpcService.h
similarity index 100%
rename from src/rpcService/rpcService.h
rename to src/rpcService/pv/rpcService.h
diff --git a/src/server/baseChannelRequester.h b/src/server/pv/baseChannelRequester.h
similarity index 100%
rename from src/server/baseChannelRequester.h
rename to src/server/pv/baseChannelRequester.h
diff --git a/src/server/beaconEmitter.h b/src/server/pv/beaconEmitter.h
similarity index 100%
rename from src/server/beaconEmitter.h
rename to src/server/pv/beaconEmitter.h
diff --git a/src/server/beaconServerStatusProvider.h b/src/server/pv/beaconServerStatusProvider.h
similarity index 100%
rename from src/server/beaconServerStatusProvider.h
rename to src/server/pv/beaconServerStatusProvider.h
diff --git a/src/server/responseHandlers.h b/src/server/pv/responseHandlers.h
similarity index 100%
rename from src/server/responseHandlers.h
rename to src/server/pv/responseHandlers.h
diff --git a/src/server/serverChannelImpl.h b/src/server/pv/serverChannelImpl.h
similarity index 100%
rename from src/server/serverChannelImpl.h
rename to src/server/pv/serverChannelImpl.h
diff --git a/src/server/serverContext.h b/src/server/pv/serverContext.h
similarity index 100%
rename from src/server/serverContext.h
rename to src/server/pv/serverContext.h
diff --git a/src/utils/configuration.h b/src/utils/pv/configuration.h
similarity index 100%
rename from src/utils/configuration.h
rename to src/utils/pv/configuration.h
diff --git a/src/utils/hexDump.h b/src/utils/pv/hexDump.h
similarity index 100%
rename from src/utils/hexDump.h
rename to src/utils/pv/hexDump.h
diff --git a/src/utils/inetAddressUtil.h b/src/utils/pv/inetAddressUtil.h
similarity index 100%
rename from src/utils/inetAddressUtil.h
rename to src/utils/pv/inetAddressUtil.h
diff --git a/src/utils/introspectionRegistry.h b/src/utils/pv/introspectionRegistry.h
similarity index 100%
rename from src/utils/introspectionRegistry.h
rename to src/utils/pv/introspectionRegistry.h
diff --git a/src/utils/likely.h b/src/utils/pv/likely.h
similarity index 100%
rename from src/utils/likely.h
rename to src/utils/pv/likely.h
diff --git a/src/utils/logger.h b/src/utils/pv/logger.h
similarity index 100%
rename from src/utils/logger.h
rename to src/utils/pv/logger.h
diff --git a/src/utils/namedLockPattern.h b/src/utils/pv/namedLockPattern.h
similarity index 100%
rename from src/utils/namedLockPattern.h
rename to src/utils/pv/namedLockPattern.h
diff --git a/src/utils/referenceCountingLock.h b/src/utils/pv/referenceCountingLock.h
similarity index 100%
rename from src/utils/referenceCountingLock.h
rename to src/utils/pv/referenceCountingLock.h
diff --git a/src/utils/wildcard.h b/src/utils/pv/wildcard.h
similarity index 100%
rename from src/utils/wildcard.h
rename to src/utils/pv/wildcard.h