diff --git a/src/fieldSources/basicSource/basicSource/IObasicSourceList.C b/src/fieldSources/basicSource/IObasicSourceList.C
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/IObasicSourceList.C
rename to src/fieldSources/basicSource/IObasicSourceList.C
diff --git a/src/fieldSources/basicSource/basicSource/IObasicSourceList.H b/src/fieldSources/basicSource/IObasicSourceList.H
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/IObasicSourceList.H
rename to src/fieldSources/basicSource/IObasicSourceList.H
diff --git a/src/fieldSources/basicSource/basicSource/basicSource.C b/src/fieldSources/basicSource/basicSource.C
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSource.C
rename to src/fieldSources/basicSource/basicSource.C
diff --git a/src/fieldSources/basicSource/basicSource/basicSource.H b/src/fieldSources/basicSource/basicSource.H
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSource.H
rename to src/fieldSources/basicSource/basicSource.H
diff --git a/src/fieldSources/basicSource/basicSource/basicSourceI.H b/src/fieldSources/basicSource/basicSourceI.H
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSourceI.H
rename to src/fieldSources/basicSource/basicSourceI.H
diff --git a/src/fieldSources/basicSource/basicSource/basicSourceIO.C b/src/fieldSources/basicSource/basicSourceIO.C
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSourceIO.C
rename to src/fieldSources/basicSource/basicSourceIO.C
diff --git a/src/fieldSources/basicSource/basicSource/basicSourceList.C b/src/fieldSources/basicSource/basicSourceList.C
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSourceList.C
rename to src/fieldSources/basicSource/basicSourceList.C
diff --git a/src/fieldSources/basicSource/basicSource/basicSourceList.H b/src/fieldSources/basicSource/basicSourceList.H
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSourceList.H
rename to src/fieldSources/basicSource/basicSourceList.H
diff --git a/src/fieldSources/basicSource/basicSource/basicSourceListTemplates.C b/src/fieldSources/basicSource/basicSourceListTemplates.C
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/basicSourceListTemplates.C
rename to src/fieldSources/basicSource/basicSourceListTemplates.C
diff --git a/src/fieldSources/basicSource/basicSource/makeBasicSource.H b/src/fieldSources/basicSource/makeBasicSource.H
similarity index 100%
rename from src/fieldSources/basicSource/basicSource/makeBasicSource.H
rename to src/fieldSources/basicSource/makeBasicSource.H
diff --git a/src/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C b/src/fieldSources/derived/actuationDiskSource/actuationDiskSource.C
similarity index 100%
rename from src/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
rename to src/fieldSources/derived/actuationDiskSource/actuationDiskSource.C
diff --git a/src/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H b/src/fieldSources/derived/actuationDiskSource/actuationDiskSource.H
similarity index 100%
rename from src/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
rename to src/fieldSources/derived/actuationDiskSource/actuationDiskSource.H
diff --git a/src/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C b/src/fieldSources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
similarity index 100%
rename from src/fieldSources/basicSource/actuationDiskSource/actuationDiskSourceTemplates.C
rename to src/fieldSources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
rename to src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
rename to src/fieldSources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
rename to src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
rename to src/fieldSources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
rename to src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
rename to src/fieldSources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C b/src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
rename to src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
diff --git a/src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H b/src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
similarity index 100%
rename from src/fieldSources/basicSource/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
rename to src/fieldSources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
diff --git a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
similarity index 100%
rename from src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.C
rename to src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
diff --git a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
similarity index 100%
rename from src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSource.H
rename to src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
diff --git a/src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C b/src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
similarity index 100%
rename from src/fieldSources/basicSource/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
rename to src/fieldSources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
diff --git a/src/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C b/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.C
similarity index 100%
rename from src/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.C
rename to src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.C
diff --git a/src/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.H b/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.H
similarity index 100%
rename from src/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSource.H
rename to src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSource.H
diff --git a/src/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
similarity index 100%
rename from src/fieldSources/basicSource/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
rename to src/fieldSources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/bladeModel/bladeModel.C b/src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/bladeModel/bladeModel.C
rename to src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/bladeModel/bladeModel.H b/src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/bladeModel/bladeModel.H
rename to src/fieldSources/derived/rotorDiskSource/bladeModel/bladeModel.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/lookup/lookupProfile.C b/src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/lookup/lookupProfile.C
rename to src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/lookup/lookupProfile.H b/src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/lookup/lookupProfile.H
rename to src/fieldSources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModel.C b/src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModel.C
rename to src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModel.H b/src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModel.H
rename to src/fieldSources/derived/rotorDiskSource/profileModel/profileModel.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.C b/src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.C
rename to src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.H b/src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/profileModelList.H
rename to src/fieldSources/derived/rotorDiskSource/profileModel/profileModelList.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.C b/src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.C
rename to src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.H b/src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/profileModel/series/seriesProfile.H
rename to src/fieldSources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C b/src/fieldSources/derived/rotorDiskSource/rotorDiskSource.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.C
rename to src/fieldSources/derived/rotorDiskSource/rotorDiskSource.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H b/src/fieldSources/derived/rotorDiskSource/rotorDiskSource.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/rotorDiskSource.H
rename to src/fieldSources/derived/rotorDiskSource/rotorDiskSource.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H b/src/fieldSources/derived/rotorDiskSource/rotorDiskSourceI.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceI.H
rename to src/fieldSources/derived/rotorDiskSource/rotorDiskSourceI.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fieldSources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/rotorDiskSourceTemplates.C
rename to src/fieldSources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C b/src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.C
rename to src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.H b/src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/fixed/fixedTrim.H
rename to src/fieldSources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
rename to src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H b/src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
rename to src/fieldSources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C b/src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.C
rename to src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.H b/src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModel.H
rename to src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
diff --git a/src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
similarity index 100%
rename from src/fieldSources/basicSource/rotorDiskSource/trimModel/trimModel/trimModelNew.C
rename to src/fieldSources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
diff --git a/src/fieldSources/basicSource/codedSource/CodedSource.C b/src/fieldSources/general/codedSource/CodedSource.C
similarity index 100%
rename from src/fieldSources/basicSource/codedSource/CodedSource.C
rename to src/fieldSources/general/codedSource/CodedSource.C
diff --git a/src/fieldSources/basicSource/codedSource/CodedSource.H b/src/fieldSources/general/codedSource/CodedSource.H
similarity index 100%
rename from src/fieldSources/basicSource/codedSource/CodedSource.H
rename to src/fieldSources/general/codedSource/CodedSource.H
diff --git a/src/fieldSources/basicSource/codedSource/CodedSourceIO.C b/src/fieldSources/general/codedSource/CodedSourceIO.C
similarity index 100%
rename from src/fieldSources/basicSource/codedSource/CodedSourceIO.C
rename to src/fieldSources/general/codedSource/CodedSourceIO.C
diff --git a/src/fieldSources/basicSource/codedSource/codedSource.C b/src/fieldSources/general/codedSource/codedSource.C
similarity index 100%
rename from src/fieldSources/basicSource/codedSource/codedSource.C
rename to src/fieldSources/general/codedSource/codedSource.C
diff --git a/src/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C b/src/fieldSources/general/explicitSetValue/ExplicitSetValue.C
similarity index 100%
rename from src/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.C
rename to src/fieldSources/general/explicitSetValue/ExplicitSetValue.C
diff --git a/src/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H b/src/fieldSources/general/explicitSetValue/ExplicitSetValue.H
similarity index 100%
rename from src/fieldSources/basicSource/explicitSetValue/ExplicitSetValue.H
rename to src/fieldSources/general/explicitSetValue/ExplicitSetValue.H
diff --git a/src/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C b/src/fieldSources/general/explicitSetValue/ExplicitSetValueIO.C
similarity index 100%
rename from src/fieldSources/basicSource/explicitSetValue/ExplicitSetValueIO.C
rename to src/fieldSources/general/explicitSetValue/ExplicitSetValueIO.C
diff --git a/src/fieldSources/basicSource/explicitSetValue/explicitSetValue.C b/src/fieldSources/general/explicitSetValue/explicitSetValue.C
similarity index 100%
rename from src/fieldSources/basicSource/explicitSetValue/explicitSetValue.C
rename to src/fieldSources/general/explicitSetValue/explicitSetValue.C
diff --git a/src/fieldSources/basicSource/explicitSource/ExplicitSource.C b/src/fieldSources/general/explicitSource/ExplicitSource.C
similarity index 100%
rename from src/fieldSources/basicSource/explicitSource/ExplicitSource.C
rename to src/fieldSources/general/explicitSource/ExplicitSource.C
diff --git a/src/fieldSources/basicSource/explicitSource/ExplicitSource.H b/src/fieldSources/general/explicitSource/ExplicitSource.H
similarity index 100%
rename from src/fieldSources/basicSource/explicitSource/ExplicitSource.H
rename to src/fieldSources/general/explicitSource/ExplicitSource.H
diff --git a/src/fieldSources/basicSource/explicitSource/ExplicitSourceI.H b/src/fieldSources/general/explicitSource/ExplicitSourceI.H
similarity index 100%
rename from src/fieldSources/basicSource/explicitSource/ExplicitSourceI.H
rename to src/fieldSources/general/explicitSource/ExplicitSourceI.H
diff --git a/src/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C b/src/fieldSources/general/explicitSource/ExplicitSourceIO.C
similarity index 100%
rename from src/fieldSources/basicSource/explicitSource/ExplicitSourceIO.C
rename to src/fieldSources/general/explicitSource/ExplicitSourceIO.C
diff --git a/src/fieldSources/basicSource/explicitSource/explicitSource.C b/src/fieldSources/general/explicitSource/explicitSource.C
similarity index 100%
rename from src/fieldSources/basicSource/explicitSource/explicitSource.C
rename to src/fieldSources/general/explicitSource/explicitSource.C