diff --git a/cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE b/cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
index a9f5522e6d..b5759e4813 100755
--- a/cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
+++ b/cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
@@ -9,7 +9,7 @@ CAVE_DIR=/awips2/cave
 
 # execute the runProcedure module
 _GFECLI="${RUN_FROM_DIR}/gfeclient.sh"
-_MODULE="${CAVE_DIR}/etc/gfe/utility/PngWriter.py"
+_MODULE="${RUN_FROM_DIR}/src/ifpimage/PngWriter.py"
 
 # quoting of '$@' is used to prevent command line interpretation
 if [ ! -f $_GFECLI ] || [ ! -d $CAVE_DIR ]
diff --git a/cave/com.raytheon.viz.gfe/GFESuite/runIFPText b/cave/com.raytheon.viz.gfe/GFESuite/runIFPText
index f29ef7a2b8..64804d0b2b 100644
--- a/cave/com.raytheon.viz.gfe/GFESuite/runIFPText
+++ b/cave/com.raytheon.viz.gfe/GFESuite/runIFPText
@@ -9,7 +9,7 @@ CAVE_DIR=/awips2/cave
 
 # execute the runProcedure module
 _GFECLI="${RUN_FROM_DIR}/gfeclient.sh"
-_MODULE="${CAVE_DIR}/etc/gfe/runIFPText.py"
+_MODULE="${RUN_FROM_DIR}/src/runifptext/runIFPText.py"
 
 # quoting of '$@' is used to prevent command line interpretation
 if [ ! -f $_GFECLI ] || [ ! -d $CAVE_DIR ]
diff --git a/cave/com.raytheon.viz.gfe/GFESuite/runProcedure b/cave/com.raytheon.viz.gfe/GFESuite/runProcedure
index 9b3f2fd0c7..e76b886a3d 100755
--- a/cave/com.raytheon.viz.gfe/GFESuite/runProcedure
+++ b/cave/com.raytheon.viz.gfe/GFESuite/runProcedure
@@ -9,7 +9,7 @@ CAVE_DIR=/awips2/cave
 
 # execute the runProcedure module
 _GFECLI="${RUN_FROM_DIR}/gfeclient.sh"
-_MODULE="${CAVE_DIR}/etc/gfe/itool/runProcedure.py"
+_MODULE="${RUN_FROM_DIR}/src/runprocedure/runProcedure.py"
 
 # quoting of '$@' is used to prevent command line interpretation
 if [ ! -f $_GFECLI ] || [ ! -d $CAVE_DIR ]
diff --git a/cave/build/static/common/cave/etc/gfe/utility/PngWriter.py b/cave/com.raytheon.viz.gfe/GFESuite/src/ifpimage/PngWriter.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/utility/PngWriter.py
rename to cave/com.raytheon.viz.gfe/GFESuite/src/ifpimage/PngWriter.py
diff --git a/cave/build/static/common/cave/etc/gfe/runIFPText.py b/cave/com.raytheon.viz.gfe/GFESuite/src/runifptext/runIFPText.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/runIFPText.py
rename to cave/com.raytheon.viz.gfe/GFESuite/src/runifptext/runIFPText.py
diff --git a/cave/build/static/common/cave/etc/gfe/itool/runProcedure.py b/cave/com.raytheon.viz.gfe/GFESuite/src/runprocedure/runProcedure.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/itool/runProcedure.py
rename to cave/com.raytheon.viz.gfe/GFESuite/src/runprocedure/runProcedure.py
diff --git a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
index 44fccbc4c0..82e46a849f 100644
--- a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
@@ -40,7 +40,6 @@ Export-Package: com.raytheon.viz.gfe,
  com.raytheon.viz.gfe.core.parm,
  com.raytheon.viz.gfe.edittool,
  com.raytheon.viz.gfe.ifpimage,
- com.raytheon.viz.gfe.itool,
  com.raytheon.viz.gfe.procedures,
  com.raytheon.viz.gfe.procedures.menu,
  com.raytheon.viz.gfe.product,
diff --git a/cave/build/static/common/cave/etc/gfe/combinations/Combinations_ColorMap b/cave/com.raytheon.viz.gfe/localization/gfe/combinations/Combinations_ColorMap
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/combinations/Combinations_ColorMap
rename to cave/com.raytheon.viz.gfe/localization/gfe/combinations/Combinations_ColorMap
diff --git a/cave/build/static/common/cave/etc/gfe/default-procedure.xml b/cave/com.raytheon.viz.gfe/localization/gfe/default-procedure.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/default-procedure.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/default-procedure.xml
diff --git a/cave/build/static/common/cave/etc/gfe/itool/ISmartScript.py b/cave/com.raytheon.viz.gfe/localization/gfe/itool/ISmartScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/itool/ISmartScript.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/itool/ISmartScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/itool/SetupTextEA.py b/cave/com.raytheon.viz.gfe/localization/gfe/itool/SetupTextEA.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/itool/SetupTextEA.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/itool/SetupTextEA.py
diff --git a/cave/build/static/common/cave/etc/gfe/itool/TextProductTest.py b/cave/com.raytheon.viz.gfe/localization/gfe/itool/TextProductTest.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/itool/TextProductTest.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/itool/TextProductTest.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/gfeConfig/EditTopo.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/EditTopo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/gfeConfig/EditTopo.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/EditTopo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/gfeConfig/gfeConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/gfeConfig/gfeConfig.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/gfeConfig/imageTest1.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/imageTest1.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/gfeConfig/imageTest1.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/imageTest1.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/Align_Grids.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Align_Grids.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/Align_Grids.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Align_Grids.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerify.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerify.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifyAutoCalc.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifyAutoCalc.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifyAutoCalc.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifyAutoCalc.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifyBiasCorr.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifyBiasCorr.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifyBiasCorr.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifyBiasCorr.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifyInfo.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifyInfo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifyInfo.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifyInfo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifySave.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySave.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifySave.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySave.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifySumTemps.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySumTemps.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/BOIVerifySumTemps.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySumTemps.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/CRMTopoAvg.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CRMTopoAvg.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/CRMTopoAvg.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CRMTopoAvg.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/CheckTTdWind.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CheckTTdWind.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/CheckTTdWind.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CheckTTdWind.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/CheckTandTd.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CheckTandTd.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/CheckTandTd.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CheckTandTd.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/CheckWindGust.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CheckWindGust.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/CheckWindGust.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/CheckWindGust.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/Collaborate_PoP_SnowAmt_QPF.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Collaborate_PoP_SnowAmt_QPF.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/Collaborate_PoP_SnowAmt_QPF.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Collaborate_PoP_SnowAmt_QPF.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/DiffFromClimo.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/DiffFromClimo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/DiffFromClimo.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/DiffFromClimo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/ERQCcheck.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/ERQCcheck.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/ERQCcheck.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/ERQCcheck.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/Extrapolate.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Extrapolate.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/Extrapolate.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Extrapolate.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/GenerateCyclone.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/GenerateCyclone.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/GenerateCyclone.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/GenerateCyclone.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/HazardRecovery.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/HazardRecovery.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/HazardRecovery.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/HazardRecovery.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/ISC_Discrepancies.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/ISC_Discrepancies.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/ISC_Discrepancies.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/ISC_Discrepancies.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MergeHazards.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MergeHazards.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/NDFD_QPF_Checks.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/NDFD_QPF_Checks.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/NDFD_QPF_Checks.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/NDFD_QPF_Checks.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/NDFDgridCheck.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/NDFDgridCheck.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/NDFDgridCheck.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/NDFDgridCheck.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/PWS_Procedure.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PWS_Procedure.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/PWS_Procedure.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PWS_Procedure.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/PlotSPCWatches.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PlotSPCWatches.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/PlotSPCWatches.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PlotSPCWatches.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/PlotTPCEvents.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PlotTPCEvents.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/PlotTPCEvents.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PlotTPCEvents.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/PopulateFromClimo.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PopulateFromClimo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/PopulateFromClimo.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/PopulateFromClimo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/Populate_SkyProcedure.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Populate_SkyProcedure.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/Populate_SkyProcedure.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Populate_SkyProcedure.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/QPF_SnowAmt.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/QPF_SnowAmt.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/QPF_SnowAmt.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/QPF_SnowAmt.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/SeparateHazards.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/SeparateHazards.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/SeparateHazards.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/SeparateHazards.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/SnowAmtQPFPoPWxCheck.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/SnowAmtQPFPoPWxCheck.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/SnowAmtQPFPoPWxCheck.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/SnowAmtQPFPoPWxCheck.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCMWindTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCMWindTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/ViewWCL.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/ViewWCL.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/procedures/ViewWCL.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/ViewWCL.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Adjust.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Adjust.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Adjust.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Adjust.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/AdjustValue_Down.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/AdjustValue_Down.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/AdjustValue_Down.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/AdjustValue_Down.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/AdjustValue_Up.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/AdjustValue_Up.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/AdjustValue_Up.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/AdjustValue_Up.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Assign_Value.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Assign_Value.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Assign_Value.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Assign_Value.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/CarSnowAmt.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/CarSnowAmt.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/CarSnowAmt.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/CarSnowAmt.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/CheckSkyWithPoP.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/CheckSkyWithPoP.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/CheckSkyWithPoP.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/CheckSkyWithPoP.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/CopyFromModel.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/CopyFromModel.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/CopyFromModel.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/CopyFromModel.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Enhanced_WxTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Enhanced_WxTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Enhanced_WxTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Enhanced_WxTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/EnufCloudForPoP.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/EnufCloudForPoP.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/EnufCloudForPoP.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/EnufCloudForPoP.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/HeatIndexTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/HeatIndexTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/HeatIndexTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/HeatIndexTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/LimitValues.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/LimitValues.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/LimitValues.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/LimitValues.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/MakeTmpGrid.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MakeTmpGrid.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/MakeTmpGrid.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MakeTmpGrid.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/MaxRH_Tool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MaxRH_Tool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/MaxRH_Tool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MaxRH_Tool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/MaxT_SmartTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MaxT_SmartTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/MaxT_SmartTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MaxT_SmartTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/MinRH_Tool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MinRH_Tool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/MinRH_Tool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MinRH_Tool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/MinT_SmartTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MinT_SmartTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/MinT_SmartTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MinT_SmartTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/ModelBlend.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/ModelBlend.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/ModelBlend.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/ModelBlend.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/MoveFeatureBySpeed.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MoveFeatureBySpeed.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/MoveFeatureBySpeed.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MoveFeatureBySpeed.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Populate_SkyTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Populate_SkyTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Populate_SkyTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Populate_SkyTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/QPF_SmartTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/QPF_SmartTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/QPF_SmartTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/QPF_SmartTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/RHTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/RHTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/RHTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/RHTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/RemoveWx.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/RemoveWx.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/RemoveWx.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/RemoveWx.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_Evolution.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_Evolution.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_Evolution.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_Evolution.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Area.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Area.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Area.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Area.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Grid.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Grid.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Grid.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Grid.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Highlights.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Highlights.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Highlights.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Highlights.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Info.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Info.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Show_ISC_Info.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Show_ISC_Info.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/Smooth.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Smooth.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/Smooth.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/Smooth.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/SnowAmt_SmartTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/SnowAmt_SmartTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/SnowAmt_SmartTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/SnowAmt_SmartTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/SnowAmt_fm_SnowRatio_and_QPF.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/SnowAmt_fm_SnowRatio_and_QPF.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/SnowAmt_fm_SnowRatio_and_QPF.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/SnowAmt_fm_SnowRatio_and_QPF.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalQPF.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalQPF.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalQPF.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalQPF.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalQPF_ISC.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalQPF_ISC.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalQPF_ISC.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalQPF_ISC.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalSnow.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalSnow.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalSnow.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalSnow.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalSnow_ISC.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalSnow_ISC.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/StormTotalSnow_ISC.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/StormTotalSnow_ISC.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/WindChillTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindChillTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/WindChillTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindChillTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/WindGustFromAlgorithm.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/WindGustFromAlgorithm.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/WindGust_Tool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGust_Tool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/WindGust_Tool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGust_Tool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/getGridsTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/getGridsTool.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/getGridsTool.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/getGridsTool.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/getMaxGrid.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/getMaxGrid.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/getMaxGrid.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/getMaxGrid.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/smartTools/getSumGrids.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/getSumGrids.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/smartTools/getSumGrids.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/getSumGrids.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textProducts/MultipleElementTable.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/MultipleElementTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textProducts/MultipleElementTable.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/MultipleElementTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textProducts/MultipleElementTable_Aux_Local.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/MultipleElementTable_Aux_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textProducts/MultipleElementTable_Aux_Local.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/MultipleElementTable_Aux_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textProducts/MultipleElementTable_Local.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/MultipleElementTable_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textProducts/MultipleElementTable_Local.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/MultipleElementTable_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/Analysis.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/Analysis.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/Analysis.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/Analysis.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/ForecastNarrative.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastNarrative.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/ForecastNarrative.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastNarrative.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/ForecastTable.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/ForecastTable.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/FormatterRunner.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/FormatterRunner.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/TextFormatter.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/TextFormatter.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/offsetTime.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/offsetTime.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/offsetTime.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/offsetTime.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CallToActions.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CallToActions.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CallToActions.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CallToActions.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CityDictionary.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CityDictionary.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CityDictionary.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CityDictionary.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CombinedPhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CombinedPhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CombinedPhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CombinedPhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CommonUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CommonUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/CommonUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CommonUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ConfigVariables.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ConfigVariables.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ConfigVariables.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ConfigVariables.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ConfigurableIssuance.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ConfigurableIssuance.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ConfigurableIssuance.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ConfigurableIssuance.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/DiscretePhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/DiscretePhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/DiscretePhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/DiscretePhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/EditAreaUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/EditAreaUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/EditAreaUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/EditAreaUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/FWS_Overrides.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/FWS_Overrides.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/FWS_Overrides.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/FWS_Overrides.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/FirePhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/FirePhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/FirePhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/FirePhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Header.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Header.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Header.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Header.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Holidays.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Holidays.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Holidays.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Holidays.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Interfaces.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Interfaces.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Interfaces.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Interfaces.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/MarinePhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/MarinePhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/MarinePhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/MarinePhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ModuleAccessor.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ModuleAccessor.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ModuleAccessor.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ModuleAccessor.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Patch_Overrides.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Patch_Overrides.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Patch_Overrides.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Patch_Overrides.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/PeriodByArea.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PeriodByArea.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/PeriodByArea.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PeriodByArea.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/PhraseBuilder.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PhraseBuilder.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/PhraseBuilder.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PhraseBuilder.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Phrase_Test_Local.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Phrase_Test_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Phrase_Test_Local.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Phrase_Test_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SAF_Overrides.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SAF_Overrides.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SAF_Overrides.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SAF_Overrides.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SampleAnalysis.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SampleAnalysis.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SampleAnalysis.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SampleAnalysis.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ScalarPhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ScalarPhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/ScalarPhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/ScalarPhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SimpleTableUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SimpleTableUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SimpleTableUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SimpleTableUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SiteCFG.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SiteCFG.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SiteCFG.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SiteCFG.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SiteInfo.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SiteInfo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SiteInfo.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SiteInfo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/StringUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/StringUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/StringUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/StringUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SurfAreaDictionary.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SurfAreaDictionary.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/SurfAreaDictionary.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SurfAreaDictionary.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TableBuilder.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TableBuilder.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TableBuilder.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TableBuilder.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TextRules.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TextRules.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TextRules.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TextRules.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TextUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TextUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TextUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TextUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TimeDescriptor.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TimeDescriptor.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TimeDescriptor.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TimeDescriptor.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TimeRangeUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TimeRangeUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/TimeRangeUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/TimeRangeUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Translator.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Translator.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Translator.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Translator.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Utility.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Utility.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/Utility.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Utility.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VTECMessageType.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VTECMessageType.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VTECMessageType.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VTECMessageType.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VarDictGroker.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VarDictGroker.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VarDictGroker.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VarDictGroker.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/WeatherSubKey.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WeatherSubKey.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/WeatherSubKey.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WeatherSubKey.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/WxDefinition.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WxDefinition.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/WxDefinition.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WxDefinition.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/WxPhrases.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WxPhrases.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/WxPhrases.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WxPhrases.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/AppDialog.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/AppDialog.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/AppDialog.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/AppDialog.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/BOIVerifyConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyConfig.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/BOIVerifyConfig.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyConfig.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/BOIVerifyUtility.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyUtility.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/BOIVerifyUtility.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyUtility.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/CombinationsInterface.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/CombinationsInterface.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/Exceptions.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/Exceptions.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/Exceptions.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/Exceptions.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/GridInfo.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/GridInfo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/GridInfo.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/GridInfo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/HazardUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/HazardUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/HazardUtils.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/HazardUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ISC_Utility.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/ISC_Utility.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ISC_Utility_Local.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/ISC_Utility_Local.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/IToolInterface.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/IToolInterface.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/IToolInterface.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/IToolInterface.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/MakeHazardConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/MakeHazardConfig.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/MakeHazardConfig.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/MakeHazardConfig.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/MessageBox.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/MessageBox.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/MessageBox.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/MessageBox.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProcedureInterface.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ProcedureInterface.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/ProcedureInterface.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ProcedureInterface.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProcessVariableList.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ProcessVariableList.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/ProcessVariableList.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ProcessVariableList.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ProductParser.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ProductParser.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/ProductParser.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ProductParser.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartToolInterface.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartToolInterface.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartToolInterface.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartToolInterface.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/StartupDialog.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/StartupDialog.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/StartupDialog.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/StartupDialog.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/TkDefaults.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TkDefaults.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/TkDefaults.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TkDefaults.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/WxMethods.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/WxMethods.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/WxMethods.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/WxMethods.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/utilities/ZoneCombinerConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ZoneCombinerConfig.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/utilities/ZoneCombinerConfig.py
rename to cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ZoneCombinerConfig.py
diff --git a/cave/build/static/common/cave/etc/gfe/weGroups/EditTopo.xml b/cave/com.raytheon.viz.gfe/localization/gfe/weGroups/EditTopo.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/weGroups/EditTopo.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/weGroups/EditTopo.xml
diff --git a/cave/build/static/common/cave/etc/gfe/weGroups/FireWx.xml b/cave/com.raytheon.viz.gfe/localization/gfe/weGroups/FireWx.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/weGroups/FireWx.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/weGroups/FireWx.xml
diff --git a/cave/build/static/common/cave/etc/gfe/weGroups/Hazards.xml b/cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Hazards.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/weGroups/Hazards.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Hazards.xml
diff --git a/cave/build/static/common/cave/etc/gfe/weGroups/Marine.xml b/cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Marine.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/weGroups/Marine.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Marine.xml
diff --git a/cave/build/static/common/cave/etc/gfe/weGroups/Public.xml b/cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Public.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/weGroups/Public.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Public.xml
diff --git a/cave/build/static/common/cave/etc/gfe/weGroups/Temps.xml b/cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Temps.xml
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/weGroups/Temps.xml
rename to cave/com.raytheon.viz.gfe/localization/gfe/weGroups/Temps.xml
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/AllowedHazards_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/AllowedHazards_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/AllowedHazards_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/AllowedHazards_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/CivilEmerg_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/CivilEmerg_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/CivilEmerg_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/CivilEmerg_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/CreateGrids.py b/cave/com.raytheon.viz.gfe/python/autotest/CreateGrids.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/CreateGrids.py
rename to cave/com.raytheon.viz.gfe/python/autotest/CreateGrids.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/ExpireAlg_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/ExpireAlg_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/ExpireAlg_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/ExpireAlg_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/ExpireTime_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/ExpireTime_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/ExpireTime_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/ExpireTime_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/Hazard_HLS_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/Hazard_HLS_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/Hazard_HLS_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/Hazard_HLS_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/HazardsComplex1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/HazardsComplex1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/HazardsComplex1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/HazardsComplex1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/Hazards_Overview_Options_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/Hazards_Overview_Options_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/Hazards_Overview_Options_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/Hazards_Overview_Options_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/Hazards_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/Hazards_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/Hazards_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/Hazards_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/HeadlineSort_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/HeadlineSort_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/HeadlineSort_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/HeadlineSort_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/Headline_UPG_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/Headline_UPG_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/Headline_UPG_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/Headline_UPG_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/HeadlinesTiming_Warn_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/HeadlinesTiming_Warn_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/HeadlinesTiming_Warn_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/HeadlinesTiming_Warn_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/HeadlinesTiming_Watch_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/HeadlinesTiming_Watch_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/HeadlinesTiming_Watch_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/HeadlinesTiming_Watch_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/MultipleTZ_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/MultipleTZ_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/MultipleTZ_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/MultipleTZ_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_AFD_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_AFD_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_AFD_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_AFD_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_AFM_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_AFM_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_AFM_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_AFM_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_Baseline_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_Baseline_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_Baseline_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_Baseline_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_CCF_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_CCF_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_CCF_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_CCF_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_FWFTable_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_FWFTable_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_FWFTable_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_FWFTable_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_FWF_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_FWF_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_FWF_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_FWF_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_FWS_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_FWS_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_FWS_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_FWS_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_GLF_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_GLF_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_GLF_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_GLF_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_PFM_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_PFM_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_PFM_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_PFM_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_Region_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_Region_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_Region_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_Region_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SAF_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SAF_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SAF_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SAF_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SFT_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SFT_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SFT_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SFT_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SRF_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SRF_TestScript.py
similarity index 99%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SRF_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SRF_TestScript.py
index cdf15437f9..448c9a94fd 100644
--- a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_SRF_TestScript.py
+++ b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_SRF_TestScript.py
@@ -119,7 +119,7 @@ testUVI = [
 
 import os
 path, file = os.path.split(__file__)
-path = os.path.abspath(os.path.join(path,"../testdata"))
+path = os.path.abspath(os.path.join(path,"../../testdata"))
 testTides = """Definition["tideFiles"] = {               
              # For each tide table, list the file where it can
              # be found
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_ZFP_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_ZFP_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel1_ZFP_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel1_ZFP_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel2_1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel2_1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel2_1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel2_1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel3_1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel3_1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel3_1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel3_1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel3_2_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel3_2_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel3_2_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel3_2_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel3_3_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel3_3_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel3_3_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel3_3_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel4_1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel4_1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel4_1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel4_1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_2_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_2_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_2_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_2_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_3_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_3_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_3_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_3_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_4_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_4_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/RoutineLevel5_4_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/RoutineLevel5_4_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/SPW_1_GenDict.py b/cave/com.raytheon.viz.gfe/python/autotest/SPW_1_GenDict.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/SPW_1_GenDict.py
rename to cave/com.raytheon.viz.gfe/python/autotest/SPW_1_GenDict.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/SPW_1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/SPW_1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/SPW_1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/SPW_1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_CrossingYear_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_CrossingYear_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_CrossingYear_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_CrossingYear_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_ETN_RESET_Tmode_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_ETN_RESET_Tmode_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_ETN_RESET_Tmode_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_ETN_RESET_Tmode_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_ETN_Reuse_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_ETN_Reuse_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_ETN_Reuse_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_ETN_Reuse_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_EXP_NEW_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_EXP_NEW_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_EXP_NEW_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_EXP_NEW_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_EXT_UPG_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_EXT_UPG_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_EXT_UPG_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_EXT_UPG_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_EXTtoNOW_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_EXTtoNOW_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_EXTtoNOW_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_EXTtoNOW_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex1_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex1_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex1_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex1_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex2_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex2_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex2_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex2_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex3_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex3_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex3_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex3_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex4_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex4_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex4_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex4_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex5_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex5_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex5_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex5_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex6_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex6_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_Complex6_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_Complex6_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_FFA_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_FFA_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_FFA_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_FFA_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_GenHaz_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_GenHaz_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_GenHaz_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_GenHaz_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_UPG_SplitETNs_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_UPG_SplitETNs_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_UPG_SplitETNs_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_UPG_SplitETNs_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_WCN_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_WCN_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_GHG_WCN_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_GHG_WCN_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_Hazard_DR21021_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_Hazard_DR21021_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_Hazard_DR21021_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_Hazard_DR21021_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_Reset_Start_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_Reset_Start_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_Reset_Start_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_Reset_Start_TestScript.py
diff --git a/cave/build/static/common/cave/etc/gfe/autotest/VTEC_TestMode_TestScript.py b/cave/com.raytheon.viz.gfe/python/autotest/VTEC_TestMode_TestScript.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/autotest/VTEC_TestMode_TestScript.py
rename to cave/com.raytheon.viz.gfe/python/autotest/VTEC_TestMode_TestScript.py
diff --git a/cave/build/static/common/cave/etc/pyViz/BundlePainter.py b/cave/com.raytheon.viz.gfe/python/pyViz/BundlePainter.py
similarity index 100%
rename from cave/build/static/common/cave/etc/pyViz/BundlePainter.py
rename to cave/com.raytheon.viz.gfe/python/pyViz/BundlePainter.py
diff --git a/cave/build/static/common/cave/etc/pyViz/GFEPainter.py b/cave/com.raytheon.viz.gfe/python/pyViz/GFEPainter.py
similarity index 96%
rename from cave/build/static/common/cave/etc/pyViz/GFEPainter.py
rename to cave/com.raytheon.viz.gfe/python/pyViz/GFEPainter.py
index 3a702fd554..c5f2d6d8b3 100644
--- a/cave/build/static/common/cave/etc/pyViz/GFEPainter.py
+++ b/cave/com.raytheon.viz.gfe/python/pyViz/GFEPainter.py
@@ -18,6 +18,8 @@
 # further licensing information.
 ##
 
+import os
+
 from com.raytheon.uf.viz.core import RGBColors
 from com.raytheon.uf.viz.core.map import MapDescriptor
 from com.raytheon.uf.viz.core.rsc.capabilities import ColorableCapability,\
@@ -35,6 +37,7 @@ from java.lang import Double
 from java.lang import Integer
 from javax.imageio import ImageIO
 from java.util import HashSet
+from java.io import File
 
 #
 # GFE Painter for painting GFE data from scripts
@@ -47,7 +50,8 @@ from java.util import HashSet
 #    04/01/09                      njensen        Initial Creation.
 #    08/20/2012           #1077    randerso       Fixed backgroundColor setting
 #    09/13/2012           #1147    dgilling       Allow map labels to be disabled.
-#    11/6/2012       15406         ryu            Correction for computing domain from mask
+#    11/06/2012           15406    ryu            Correction for computing domain from mask
+#    09/12/2013           #2033    dgilling       Change how logo files are accessed.
 #
 #
 
@@ -175,12 +179,8 @@ class GFEPainter(VizPainter.VizPainter):
         rendered = self.getTarget().screenshot()
         if attachLogo:
             from java.awt.image import BufferedImage
-            from com.raytheon.uf.common.localization import PathManagerFactory
-            noaa = 'pyViz/logos/noaalogo2.png'
-            nws = 'pyViz/logos/nwslogo.png'
-            pathMgr = PathManagerFactory.getPathManager()
-            noaa = pathMgr.getStaticFile(noaa)
-            nws = pathMgr.getStaticFile(nws)
+            noaa = File(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'logos/noaalogo2.png'))
+            nws = File(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'logos/nwslogo.png'))
             noaaImage = ImageIO.read(noaa)
             nwsImage = ImageIO.read(nws)
             height = rendered.getHeight() + noaaImage.getHeight()
diff --git a/cave/build/static/common/cave/etc/pyViz/VizPainter.py b/cave/com.raytheon.viz.gfe/python/pyViz/VizPainter.py
similarity index 100%
rename from cave/build/static/common/cave/etc/pyViz/VizPainter.py
rename to cave/com.raytheon.viz.gfe/python/pyViz/VizPainter.py
diff --git a/cave/build/static/common/cave/etc/pyViz/logos/noaalogo2.png b/cave/com.raytheon.viz.gfe/python/pyViz/logos/noaalogo2.png
similarity index 100%
rename from cave/build/static/common/cave/etc/pyViz/logos/noaalogo2.png
rename to cave/com.raytheon.viz.gfe/python/pyViz/logos/noaalogo2.png
diff --git a/cave/build/static/common/cave/etc/pyViz/logos/nwslogo.png b/cave/com.raytheon.viz.gfe/python/pyViz/logos/nwslogo.png
similarity index 100%
rename from cave/build/static/common/cave/etc/pyViz/logos/nwslogo.png
rename to cave/com.raytheon.viz.gfe/python/pyViz/logos/nwslogo.png
diff --git a/cave/build/static/common/cave/etc/pyViz/testBundlePainter.py b/cave/com.raytheon.viz.gfe/python/pyViz/testBundlePainter.py
similarity index 100%
rename from cave/build/static/common/cave/etc/pyViz/testBundlePainter.py
rename to cave/com.raytheon.viz.gfe/python/pyViz/testBundlePainter.py
diff --git a/cave/build/static/common/cave/etc/gfe/query/DBSSClient.py b/cave/com.raytheon.viz.gfe/python/query/DBSSClient.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/query/DBSSClient.py
rename to cave/com.raytheon.viz.gfe/python/query/DBSSClient.py
diff --git a/cave/build/static/common/cave/etc/gfe/query/Evaluator.py b/cave/com.raytheon.viz.gfe/python/query/Evaluator.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/query/Evaluator.py
rename to cave/com.raytheon.viz.gfe/python/query/Evaluator.py
diff --git a/cave/build/static/common/cave/etc/gfe/query/Query.py b/cave/com.raytheon.viz.gfe/python/query/Query.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/query/Query.py
rename to cave/com.raytheon.viz.gfe/python/query/Query.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/ElementByPeriod.py b/cave/com.raytheon.viz.gfe/python/testFormatters/ElementByPeriod.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/ElementByPeriod.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/ElementByPeriod.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/FirePeriodTable.py b/cave/com.raytheon.viz.gfe/python/testFormatters/FirePeriodTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/FirePeriodTable.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/FirePeriodTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/LE_Test_Local.py b/cave/com.raytheon.viz.gfe/python/testFormatters/LE_Test_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/LE_Test_Local.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/LE_Test_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/MarineSnapshotTable.py b/cave/com.raytheon.viz.gfe/python/testFormatters/MarineSnapshotTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/MarineSnapshotTable.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/MarineSnapshotTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/PeriodByElement.py b/cave/com.raytheon.viz.gfe/python/testFormatters/PeriodByElement.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/PeriodByElement.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/PeriodByElement.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/PeriodTable.py b/cave/com.raytheon.viz.gfe/python/testFormatters/PeriodTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/PeriodTable.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/PeriodTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/QPFTable.py b/cave/com.raytheon.viz.gfe/python/testFormatters/QPFTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/QPFTable.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/QPFTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/RDFcst.py b/cave/com.raytheon.viz.gfe/python/testFormatters/RDFcst.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/RDFcst.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/RDFcst.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/RecreationFcst.py b/cave/com.raytheon.viz.gfe/python/testFormatters/RecreationFcst.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/RecreationFcst.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/RecreationFcst.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/RecreationFcst_Local.py b/cave/com.raytheon.viz.gfe/python/testFormatters/RecreationFcst_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/RecreationFcst_Local.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/RecreationFcst_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/SmartElementTable.py b/cave/com.raytheon.viz.gfe/python/testFormatters/SmartElementTable.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/SmartElementTable.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/SmartElementTable.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/SmartElementTable_Local.py b/cave/com.raytheon.viz.gfe/python/testFormatters/SmartElementTable_Local.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/SmartElementTable_Local.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/SmartElementTable_Local.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/SurfaceTemp.py b/cave/com.raytheon.viz.gfe/python/testFormatters/SurfaceTemp.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/SurfaceTemp.py
rename to cave/com.raytheon.viz.gfe/python/testFormatters/SurfaceTemp.py
diff --git a/cave/build/static/common/cave/etc/gfe/utility/loadConfig.py b/cave/com.raytheon.viz.gfe/python/utility/loadConfig.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/utility/loadConfig.py
rename to cave/com.raytheon.viz.gfe/python/utility/loadConfig.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/config.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/config.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/config.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/config.vm
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/procedure.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/procedure.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/procedure.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/procedure.vm
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/smartTool.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/smartTool.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/smartTool.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/smartTool.vm
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/textProductSmart.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/textProductSmart.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/textProductSmart.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/textProductSmart.vm
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/textProductTable.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/textProductTable.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/textUtility.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/textUtility.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/textUtility.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/textUtility.vm
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/templates/utility.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/utility.vm
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/templates/utility.vm
rename to cave/com.raytheon.viz.gfe/scriptTemplates/utility.vm
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
index f5a631fd56..6182abbe87 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
@@ -19,6 +19,7 @@
  **/
 package com.raytheon.viz.gfe;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,19 +27,17 @@ import java.util.HashSet;
 import jep.Jep;
 import jep.JepException;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 
-import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.VizApp;
+import com.raytheon.viz.gfe.python.GfeCavePyIncludeUtil;
 import com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent;
 
 /**
@@ -52,6 +51,9 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent;
  * Jun 25, 2010            mschenke     Initial creation
  * Aug 20, 2012  #1081     dgilling     Don't pass -server and -site args
  *                                      to python script.
+ * Sep 11, 2013  #2033     dgilling     Update path to utilityDir and pyVizDir,
+ *                                      now that they're no longer in 
+ *                                      localization store.
  * 
  * </pre>
  * 
@@ -93,39 +95,39 @@ public class GfeClient extends AbstractCAVEComponent {
 
         System.out.println("Running script: " + args[gfeClientArgStartIndex]);
 
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-
-        LocalizationContext baseContext = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-
-        String pyVizDir = pathMgr.getFile(baseContext, "pyViz").getPath();
+        String pyVizDir = new File(FileLocator.resolve(
+                FileLocator.find(Activator.getDefault().getBundle(), new Path(
+                        FileUtil.join("python", "pyViz")), null)).getPath())
+                .getPath();
 
         String pyInclude = System.getProperty("python_include");
         if (pyInclude == null) {
             pyInclude = "";
         }
 
-        String utilityDir = pathMgr.getFile(baseContext,
-                com.raytheon.uf.common.util.FileUtil.join("gfe", "utility"))
+        String utilityDir = new File(FileLocator.resolve(
+                FileLocator.find(Activator.getDefault().getBundle(), new Path(
+                        FileUtil.join("python", "utility")), null)).getPath())
                 .getPath();
 
         boolean includeUser = (!VizApp.getWsId().getUserName().equals("SITE"));
 
         String includePath = PyUtil.buildJepIncludePath(true, pyInclude,
-                utilityDir, GfePyIncludeUtil.getCommonPythonIncludePath(),
-                GfePyIncludeUtil.getCommonGfeIncludePath(),
-                GfePyIncludeUtil.getConfigIncludePath(includeUser), pyVizDir,
-                GfePyIncludeUtil.getUtilitiesIncludePath(includeUser),
-                GfePyIncludeUtil.getIToolIncludePath(),
-                GfePyIncludeUtil.getVtecIncludePath(),
-                GfePyIncludeUtil.getHeadlineIncludePath(),
-                GfePyIncludeUtil.getAutotestIncludePath(),
-                GfePyIncludeUtil.getTextUtilitiesIncludePath(includeUser),
-                GfePyIncludeUtil.getTextProductsIncludePath(includeUser),
-                GfePyIncludeUtil.getTextProductsTemplatesIncludePath(),
-                GfePyIncludeUtil.getCombinationsIncludePath(includeUser),
-                GfePyIncludeUtil.getTestsIncludePath(),
-                GfePyIncludeUtil.getProceduresIncludePath(includeUser));
+                utilityDir, GfeCavePyIncludeUtil.getCommonPythonIncludePath(),
+                GfeCavePyIncludeUtil.getCommonGfeIncludePath(),
+                GfeCavePyIncludeUtil.getConfigIncludePath(includeUser),
+                pyVizDir,
+                GfeCavePyIncludeUtil.getUtilitiesIncludePath(includeUser),
+                GfeCavePyIncludeUtil.getIToolIncludePath(),
+                GfeCavePyIncludeUtil.getVtecIncludePath(),
+                GfeCavePyIncludeUtil.getHeadlineIncludePath(),
+                GfeCavePyIncludeUtil.getAutotestIncludePath(),
+                GfeCavePyIncludeUtil.getTextUtilitiesIncludePath(includeUser),
+                GfeCavePyIncludeUtil.getTextProductsIncludePath(includeUser),
+                GfeCavePyIncludeUtil.getTextProductsTemplatesIncludePath(),
+                GfeCavePyIncludeUtil.getCombinationsIncludePath(includeUser),
+                GfeCavePyIncludeUtil.getTestsIncludePath(),
+                GfeCavePyIncludeUtil.getProceduresIncludePath(includeUser));
 
         Jep jep = null;
         try {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/PythonPreferenceStore.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/PythonPreferenceStore.java
index 4430845ad9..a665b5d606 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/PythonPreferenceStore.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/PythonPreferenceStore.java
@@ -20,6 +20,7 @@
 package com.raytheon.viz.gfe;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +29,8 @@ import java.util.NoSuchElementException;
 
 import jep.JepException;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.util.IPropertyChangeListener;
@@ -35,15 +38,12 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.util.SafeRunnable;
 
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.raytheon.uf.common.util.FileUtil;
 
 /**
  * Preference store for reading from legacy GFE config files.
@@ -56,6 +56,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Dec 11, 2009            njensen     Initial creation
  * Jun 22, 2011  9897      ryu         allow new GFE config and send notification
  * Sep 05, 2013  #2307     dgilling    Use better PythonScript constructor.
+ * Sep 11, 2013  #2033     dgilling    Don't load loadConfig.py from 
+ *                                     localization store.
  * 
  * </pre>
  * 
@@ -87,28 +89,28 @@ public class PythonPreferenceStore implements IPreferenceStore,
 
     @SuppressWarnings("unchecked")
     public void loadConfiguration(String configName) {
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-        String utilityDir = pathMgr.getFile(
-                pathMgr.getContext(LocalizationType.CAVE_STATIC,
-                        LocalizationLevel.BASE),
-                com.raytheon.uf.common.util.FileUtil.join("gfe", "utility"))
-                .getPath();
-
         String configPath = GfePyIncludeUtil.getConfigIncludePath();
         String vtecPath = GfePyIncludeUtil.getVtecIncludePath();
 
         PythonScript py = null;
         try {
-            py = new PythonScript(
-                    utilityDir + File.separator + "loadConfig.py",
+            File scriptFile = new File(FileLocator.resolve(
+                    FileLocator.find(
+                            Activator.getDefault().getBundle(),
+                            new Path(FileUtil.join("python", "utility",
+                                    "loadConfig.py")), null)).getPath());
+            py = new PythonScript(scriptFile.getPath(),
                     PyUtil.buildJepIncludePath(configPath, vtecPath), this
                             .getClass().getClassLoader());
         } catch (JepException e) {
             statusHandler.handle(Priority.CRITICAL,
                     "Unable to load GFE config", e);
+        } catch (IOException e) {
+            statusHandler.handle(Priority.CRITICAL,
+                    "Unable to find loadConfig.py in internal bundle.", e);
         }
 
-        Map<String, Object> args = new HashMap<String, Object>(1);
+        Map<String, Object> args = new HashMap<String, Object>(1, 1f);
         args.put("configName", "gfeConfig");
         try {
             baseConfiguration = (Map<String, Object>) py.execute("loadConfig",
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
index af7a1439d0..ba60555d85 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
@@ -65,8 +65,6 @@ import com.raytheon.viz.gfe.core.internal.WEGroupManager;
 import com.raytheon.viz.gfe.core.msgs.ISCSendStatusChangedMsg;
 import com.raytheon.viz.gfe.core.parm.ParmOp;
 import com.raytheon.viz.gfe.gridmanager.IGridManager;
-import com.raytheon.viz.gfe.itool.IToolController;
-import com.raytheon.viz.gfe.itool.IToolFactory;
 import com.raytheon.viz.gfe.jobs.AutoSaveJob;
 import com.raytheon.viz.gfe.procedures.ProcedureFactory;
 import com.raytheon.viz.gfe.procedures.ProcedureUIController;
@@ -98,6 +96,7 @@ import com.raytheon.viz.gfe.textformatter.TextProductManager;
  *                                     to GFE startup.
  * 08/27/2013    2302      randerso    Code cleanup for AutoSaveJob
  * 09/05/2013    2307      dgilling    Use better PythonScript constructor.
+ * 09/16/2013    2033      dgilling    Remove unused IToolController.
  * 
  * </pre>
  * 
@@ -166,8 +165,6 @@ public class DataManager {
 
     private TextProductManager textProductMgr;
 
-    private IToolController itoolInterface;
-
     private EditActionProcessor editActionProcessor;
 
     /** interval that the parm evictor runs-- every 15 seconds */
@@ -520,18 +517,6 @@ public class DataManager {
         return procedureInterface;
     }
 
-    public IToolController getIToolInterface() {
-        if (itoolInterface == null) {
-            try {
-                this.itoolInterface = IToolFactory.buildController(this);
-            } catch (JepException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error initializing itool interface", e);
-            }
-        }
-        return itoolInterface;
-    }
-
     /**
      * @return A List of Objects, the active table.
      * @throws VizException
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java
index f13a2bea6d..9cd233ca9c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java
@@ -31,22 +31,35 @@ import java.util.regex.Pattern;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PythonFileFilter;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
+import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEException;
 import com.raytheon.viz.gfe.smarttool.SmartToolConstants;
 
 /**
  * An abstract base class that provides a default implementation of IScriptUtil.
  * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 09, 2013  #2033     dgilling    Use new templates directory.
+ * 
+ * </pre>
+ * 
  * @author wldougher
  * 
  */
@@ -263,6 +276,7 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
     /**
      * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptType()
      */
+    @Override
     abstract public String getScriptType();
 
     /*
@@ -271,6 +285,7 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
      * @see
      * com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptTypePathPrefix()
      */
+    @Override
     abstract public String getScriptTypePathPrefix();
 
     /**
@@ -306,17 +321,23 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
      * @throws GFEException
      */
     protected void initVelocity() throws GFEException {
-        LocalizationContext baseCtx = pathManager.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-        File templateFile = pathManager.getFile(baseCtx,
-                SmartToolConstants.TEMPLATES_DIR);
-        Properties properties = new Properties();
-        properties.setProperty("file.resource.loader.path", templateFile
-                .getPath());
         try {
-            Velocity.init(properties);
-        } catch (Exception e) {
-            throw new GFEException("Error initializing Velocity", e);
+            File templateFile = new File(FileLocator.resolve(
+                    FileLocator.find(Activator.getDefault().getBundle(),
+                            new Path(SmartToolConstants.TEMPLATES_DIR), null))
+                    .getPath());
+            Properties properties = new Properties();
+            properties.setProperty("file.resource.loader.path",
+                    templateFile.getPath());
+
+            try {
+                Velocity.init(properties);
+            } catch (Exception e) {
+                throw new GFEException("Error initializing Velocity", e);
+            }
+        } catch (IOException e) {
+            throw new GFEException(
+                    "Error locating script templates directory.", e);
         }
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/itool/IToolController.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/itool/IToolController.java
deleted file mode 100644
index 9d9e3fa18b..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/itool/IToolController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.gfe.itool;
-
-import java.util.HashMap;
-
-import jep.JepException;
-
-import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
-import com.raytheon.uf.common.python.PyConstants;
-import com.raytheon.viz.gfe.BaseGfePyController;
-import com.raytheon.viz.gfe.core.DataManager;
-
-/**
- * TODO Add Description
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Apr 21, 2009            njensen     Initial creation
- * 
- * </pre>
- * 
- * @author njensen
- * @version 1.0
- */
-
-public class IToolController extends BaseGfePyController {
-
-    protected IToolController(String filePath, String anIncludePath,
-            ClassLoader classLoader, DataManager dataManager)
-            throws JepException {
-        super(filePath, anIncludePath, classLoader, dataManager, "ITool");
-        jep.eval(INTERFACE + " = IToolInterface('"
-                + GfePyIncludeUtil.getIToolIncludePath() + "')");
-    }
-
-    public Object execute(String toolName) throws JepException {
-        HashMap<String, Object> args = new HashMap<String, Object>();
-        args.put(PyConstants.METHOD_NAME, "execute");
-        args.put(PyConstants.MODULE_NAME, toolName);
-        args.put(PyConstants.CLASS_NAME, pythonClassName);
-        args.put("varDict", null); // TODO is this safe?
-
-        internalExecute("runITool", INTERFACE, args);
-
-        return getExecutionResult();
-    }
-
-    @Override
-    protected void evaluateArgument(String argName, Object argValue)
-            throws JepException {
-        if (argName.startsWith("varDict")) {
-            jep.eval(argName + " = varDict");
-        } else {
-            super.evaluateArgument(argName, argValue);
-        }
-    }
-
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/itool/IToolFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/itool/IToolFactory.java
deleted file mode 100644
index 5f8cfd82c8..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/itool/IToolFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.gfe.itool;
-
-import jep.JepException;
-
-import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.python.PyUtil;
-import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.viz.gfe.core.DataManager;
-
-/**
- * TODO Add Description
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Apr 21, 2009            njensen     Initial creation
- * 
- * </pre>
- * 
- * @author njensen
- * @version 1.0
- */
-
-public class IToolFactory {
-
-    public static IToolController buildController(DataManager dataMgr)
-            throws JepException {
-        LocalizationContext baseCtx = PathManagerFactory.getPathManager()
-                .getContext(LocalizationType.CAVE_STATIC,
-                        LocalizationLevel.BASE);
-        String utilDir = GfePyIncludeUtil.getUtilitiesLF(baseCtx).getFile()
-                .getPath();
-        String scriptPath = FileUtil.join(utilDir, "IToolInterface.py");
-
-        return new IToolController(scriptPath, PyUtil.buildJepIncludePath(
-                GfePyIncludeUtil.getCommonPythonIncludePath(),
-                GfePyIncludeUtil.getVtecIncludePath(),
-                GfePyIncludeUtil.getCommonGfeIncludePath(),
-                GfePyIncludeUtil.getUtilitiesIncludePath(),
-                GfePyIncludeUtil.getProceduresIncludePath(),
-                GfePyIncludeUtil.getIToolIncludePath(),
-                GfePyIncludeUtil.getAutotestIncludePath(),
-                GfePyIncludeUtil.getTextUtilitiesIncludePath(),
-                GfePyIncludeUtil.getHeadlineIncludePath()),
-                IToolFactory.class.getClassLoader(), dataMgr);
-    }
-
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/python/GfeCavePyIncludeUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/python/GfeCavePyIncludeUtil.java
new file mode 100644
index 0000000000..394b04cdb3
--- /dev/null
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/python/GfeCavePyIncludeUtil.java
@@ -0,0 +1,90 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.gfe.python;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+
+import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.viz.gfe.Activator;
+
+/**
+ * A CAVE-specific subclass of <code>GfePyIncludeUtil</code> so we can use
+ * Eclipse-only classes to locate files within the viz.gfe plugin.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 16, 2013  #2033     dgilling     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author dgilling
+ * @version 1.0
+ */
+
+public final class GfeCavePyIncludeUtil extends GfePyIncludeUtil {
+
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(GfeCavePyIncludeUtil.class);
+
+    public static final String AUTO_TEST = FileUtil.join(PYTHON, "autotest");
+
+    public static final String TESTS = FileUtil.join(PYTHON, "testFormatters");
+
+    /**
+     * A dummy default constructor. All methods/constants in this class should
+     * be static.
+     */
+    private GfeCavePyIncludeUtil() {
+        throw new AssertionError();
+    }
+
+    private static File getBundlePath(String path) {
+        try {
+            return new File(FileLocator.resolve(
+                    FileLocator.find(Activator.getDefault().getBundle(),
+                            new Path(path), null)).getPath());
+        } catch (IOException e) {
+            statusHandler.error("Cannot locate internal bundle path: " + path,
+                    e);
+            return null;
+        }
+    }
+
+    public static String getAutotestIncludePath() {
+        File includePath = getBundlePath(AUTO_TEST);
+        return (includePath != null) ? includePath.getPath() : "";
+    }
+
+    public static String getTestsIncludePath() {
+        File includePath = getBundlePath(TESTS);
+        return (includePath != null) ? includePath.getPath() : "";
+    }
+}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScript.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScript.java
index fc200f122f..45d19c1fe5 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScript.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScript.java
@@ -20,71 +20,68 @@
 package com.raytheon.viz.gfe.query;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Map;
 
 import jep.JepException;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.core.DataManager;
 
 /**
  * Interface to run a python reference set query
  * 
  * <pre>
+ * 
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Jul 9, 2008				njensen	    Initial creation
- * 2/14/2013                mnash       Add QueryScript instantiation logic
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 09, 2008            njensen      Initial creation
+ * Feb 14, 2013            mnash        Add QueryScript instantiation logic
+ * Sep 11, 2013  #2033     dgilling     Move edit area evaluation python code
+ *                                      out of localization.
  * 
  * </pre>
  * 
  * @author njensen
  * @version 1.0
  */
-
 public class QueryScript extends PythonScript {
 
     private static final String INSTANCE = "evaluatorInstance";
 
     private DataManager dataMgr;
 
-    private static final String FILEDIR = FileUtil.join("gfe", "query");
+    private static final String FILEDIR = FileUtil.join("python", "query");
 
     private static final String FILENAME = "Evaluator.py";
 
-    public QueryScript(DataManager dm) throws JepException {
+    public QueryScript(DataManager dm) throws JepException, IOException {
         super(buildFilePath(), buildIncludePath(), QueryScript.class
                 .getClassLoader());
         dataMgr = dm;
         init();
     }
 
-    private static String buildFilePath() {
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-
-        LocalizationContext ctx = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-
-        File file = pathMgr.getFile(ctx, FileUtil.join(FILEDIR, FILENAME));
+    private static String buildFilePath() throws IOException {
+        File file = new File(FileLocator.resolve(
+                FileLocator.find(Activator.getDefault().getBundle(), new Path(
+                        FileUtil.join(FILEDIR, FILENAME)), null)).getPath());
         return file.getPath();
     }
 
-    private static String buildIncludePath() {
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-
-        LocalizationContext ctx = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-
-        File includeDir = pathMgr.getFile(ctx, FILEDIR);
+    private static String buildIncludePath() throws IOException {
+        File includeDir = new File(FileLocator.resolve(
+                FileLocator.find(Activator.getDefault().getBundle(), new Path(
+                        FILEDIR), null)).getPath());
         return PyUtil.buildJepIncludePath(includeDir.getPath(),
                 GfePyIncludeUtil.getCommonGfeIncludePath());
     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java
index 2bdf2a68ed..a79dbfe509 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java
@@ -19,6 +19,8 @@
  **/
 package com.raytheon.viz.gfe.query;
 
+import java.io.IOException;
+
 import jep.JepException;
 
 import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
@@ -81,6 +83,9 @@ public class QueryScriptFactory extends
         } catch (JepException e) {
             statusHandler.handle(Priority.ERROR,
                     "Unable to create query script", e);
+        } catch (IOException e) {
+            statusHandler.error(
+                    "Unable to create query script from internal bundle", e);
         }
         return null;
     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolConstants.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolConstants.java
index bef64d6d71..1e08ab1d9c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolConstants.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolConstants.java
@@ -19,8 +19,6 @@
  **/
 package com.raytheon.viz.gfe.smarttool;
 
-import java.io.File;
-
 /**
  * TODO Add Description
  * 
@@ -28,7 +26,8 @@ import java.io.File;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Mar 19, 2008            njensen     Initial creation	
+ * Mar 19, 2008            njensen     Initial creation
+ * Sep 09, 2013  #2033     dgilling    Use new templates directory.
  * 
  * </pre>
  * 
@@ -46,6 +45,5 @@ public class SmartToolConstants {
 
     public static final String ASSIGN = "Assign_Value";
 
-    public static final String TEMPLATES_DIR = "gfe" + File.separator
-            + "userPython" + File.separator + "templates";
+    public static final String TEMPLATES_DIR = "/scriptTemplates/";
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java
index 1064fca3c3..7d0c472f82 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java
@@ -21,11 +21,14 @@ package com.raytheon.viz.gfe.smarttool;
 
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.util.Properties;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
@@ -42,6 +45,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
+import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.PythonUtil;
 
 /**
@@ -53,6 +57,7 @@ import com.raytheon.viz.gfe.PythonUtil;
  * ------------	----------	-----------	--------------------------
  * Mar 20, 2008				njensen	    Initial creation
  * Sep 25, 2008 1562        askripsky   Moved methods out to
+ * Sep 09, 2013 #2033       dgilling    Use new templates directory.
  * 
  * </pre>
  * 
@@ -72,56 +77,64 @@ public class SmartToolEdit {
             toolFilename += PythonFileFilter.EXTENSION;
         }
 
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-        LocalizationContext tx = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-        File templateFile = PathManagerFactory.getPathManager().getFile(tx,
-                SmartToolConstants.TEMPLATES_DIR);
-
         try {
-            Properties p = new Properties();
-            p.setProperty("file.resource.loader.path", templateFile.getPath());
-            Velocity.init(p);
-            VelocityContext context = new VelocityContext();
+            File templateFile = new File(FileLocator.resolve(
+                    FileLocator.find(Activator.getDefault().getBundle(),
+                            new Path(SmartToolConstants.TEMPLATES_DIR), null))
+                    .getPath());
 
-            context.put("itemName", toolFilename);
-            context.put("parmToEdit", parmToEdit);
-            String author = LocalizationManager.getInstance().getCurrentUser();
-            context.put("author", author);
+            try {
+                Properties p = new Properties();
+                p.setProperty("file.resource.loader.path",
+                        templateFile.getPath());
+                Velocity.init(p);
+                VelocityContext context = new VelocityContext();
 
-            Template template = null;
-            template = Velocity.getTemplate("smartTool.vm");
+                context.put("itemName", toolFilename);
+                context.put("parmToEdit", parmToEdit);
+                String author = LocalizationManager.getInstance()
+                        .getCurrentUser();
+                context.put("author", author);
 
-            LocalizationContext cx = pathMgr.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-            localizationFile = PathManagerFactory.getPathManager()
-                    .getLocalizationFile(
-                            cx,
-                            GfePyIncludeUtil.SMART_TOOLS + File.separator
-                                    + toolFilename);
-            if (localizationFile != null) {
-                File file = localizationFile.getFile();
-                if (!file.getParentFile().exists()) {
-                    file.getParentFile().mkdirs();
+                Template template = null;
+                template = Velocity.getTemplate("smartTool.vm");
+
+                IPathManager pathMgr = PathManagerFactory.getPathManager();
+                LocalizationContext cx = pathMgr.getContext(
+                        LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
+                localizationFile = PathManagerFactory.getPathManager()
+                        .getLocalizationFile(
+                                cx,
+                                GfePyIncludeUtil.SMART_TOOLS + File.separator
+                                        + toolFilename);
+                if (localizationFile != null) {
+                    File file = localizationFile.getFile();
+                    if (!file.getParentFile().exists()) {
+                        file.getParentFile().mkdirs();
+                    }
+
+                    FileWriter fw = new FileWriter(localizationFile.getFile());
+
+                    template.merge(context, fw);
+                    fw.close();
+                    localizationFile.save();
+                    PythonUtil.openPythonFile(localizationFile);
+                } else {
+                    // Display Protected file message
+                    Shell shell = PlatformUI.getWorkbench()
+                            .getActiveWorkbenchWindow().getShell();
+                    String msg = toolFilename
+                            + " is a protected file and cannot be overridden.";
+                    MessageDialog.openWarning(shell, "Protected File", msg);
                 }
-
-                FileWriter fw = new FileWriter(localizationFile.getFile());
-
-                template.merge(context, fw);
-                fw.close();
-                localizationFile.save();
-                PythonUtil.openPythonFile(localizationFile);
-            } else {
-                // Display Protected file message
-                Shell shell = PlatformUI.getWorkbench()
-                        .getActiveWorkbenchWindow().getShell();
-                String msg = toolFilename
-                        + " is a protected file and cannot be overridden.";
-                MessageDialog.openWarning(shell, "Protected File", msg);
+            } catch (Exception e) {
+                statusHandler.handle(Priority.PROBLEM,
+                        "Error creating new smart tool", e);
             }
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error creating new smart tool", e);
+        } catch (IOException e) {
+            statusHandler.error(
+                    "Error retrieving templates directory for new smart tool.",
+                    e);
         }
 
         return localizationFile;
@@ -135,48 +148,55 @@ public class SmartToolEdit {
             toolFilename += PythonFileFilter.EXTENSION;
         }
 
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-        LocalizationContext tx = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-        File templateFile = pathMgr.getFile(tx,
-                SmartToolConstants.TEMPLATES_DIR);
-
         try {
-            Properties p = new Properties();
-            p.setProperty("file.resource.loader.path", templateFile.getPath());
-            Velocity.init(p);
-            VelocityContext context = new VelocityContext();
+            File templateFile = new File(FileLocator.resolve(
+                    FileLocator.find(Activator.getDefault().getBundle(),
+                            new Path(SmartToolConstants.TEMPLATES_DIR), null))
+                    .getPath());
 
-            context.put("itemName", utilityName);
-            String author = LocalizationManager.getInstance().getCurrentUser();
-            context.put("author", author);
+            try {
+                Properties p = new Properties();
+                p.setProperty("file.resource.loader.path",
+                        templateFile.getPath());
+                Velocity.init(p);
+                VelocityContext context = new VelocityContext();
 
-            Template template = null;
-            template = Velocity.getTemplate("utility.vm");
+                context.put("itemName", utilityName);
+                String author = LocalizationManager.getInstance()
+                        .getCurrentUser();
+                context.put("author", author);
 
-            LocalizationContext cx = pathMgr.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-            localizationFile = PathManagerFactory.getPathManager()
-                    .getLocalizationFile(
-                            cx,
-                            GfePyIncludeUtil.UTILITIES + File.separator
-                                    + toolFilename);
-            File file = localizationFile.getFile();
-            if (!file.getParentFile().exists()) {
-                file.getParentFile().mkdirs();
+                Template template = null;
+                template = Velocity.getTemplate("utility.vm");
+
+                IPathManager pathMgr = PathManagerFactory.getPathManager();
+                LocalizationContext cx = pathMgr.getContext(
+                        LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
+                localizationFile = PathManagerFactory.getPathManager()
+                        .getLocalizationFile(
+                                cx,
+                                GfePyIncludeUtil.UTILITIES + File.separator
+                                        + toolFilename);
+                File file = localizationFile.getFile();
+                if (!file.getParentFile().exists()) {
+                    file.getParentFile().mkdirs();
+                }
+
+                FileWriter fw = new FileWriter(localizationFile.getFile());
+
+                template.merge(context, fw);
+                fw.close();
+
+                localizationFile.save();
+
+                PythonUtil.openPythonFile(localizationFile);
+            } catch (Exception e) {
+                statusHandler.handle(Priority.PROBLEM,
+                        "Error creating new utility", e);
             }
-
-            FileWriter fw = new FileWriter(localizationFile.getFile());
-
-            template.merge(context, fw);
-            fw.close();
-
-            localizationFile.save();
-
-            PythonUtil.openPythonFile(localizationFile);
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error creating new utility", e);
+        } catch (IOException e) {
+            statusHandler.error(
+                    "Error retrieving templates directory for new utility.", e);
         }
 
         return localizationFile;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java
index f0d4a332cc..c99893da4b 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java
@@ -20,16 +20,8 @@
 package com.raytheon.viz.gfe.textproduct;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.util.Properties;
 
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
@@ -44,8 +36,6 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
-import com.raytheon.viz.gfe.PythonUtil;
 
 /**
  * Utilities for text products
@@ -55,6 +45,7 @@ import com.raytheon.viz.gfe.PythonUtil;
  * Date			Ticket#		Engineer	Description
  * ------------	----------	-----------	--------------------------
  * Sept 23, 2008			askripsky	Initial creation
+ * Sept 09, 2013  #2033     dgilling    Remove dead code.
  * 
  * </pre>
  * 
@@ -93,19 +84,6 @@ public class TextProductUtils {
     public final static String UTILITIES_PATH = TEXT_PRODUCTS_ROOT_PATH
             + File.separator + "utilities";
 
-    // Root path for Templates
-    public final static String TEMPLATES_PATH = TEXT_PRODUCTS_ROOT_PATH
-            + File.separator + "templates";
-
-    // Template for Table type Text Product
-    public final static String TEXT_PRODUCT_TABLE_TEMPLATES = "textProductTable.vm";
-
-    // Template for Smart type Text Product
-    public final static String TEXT_PRODUCT_SMART_TEMPLATES = "textProductSmart.vm";
-
-    // Template for Text Utilities
-    public final static String TEXT_UTILITY_TEMPLATES = "textUtility.vm";
-
     /**
      * Copies the source file
      * 
@@ -223,104 +201,6 @@ public class TextProductUtils {
         return rval;
     }
 
-    /**
-     * Uses Velocity templates to create new text products and utilities
-     * 
-     * @param name
-     *            The name of the new product or utility
-     * @param type
-     *            Designate whether the file is a product or a utility
-     * @param subType
-     *            Designate whether the product is a table or smart type or null
-     *            if it is a new utility
-     */
-    public static void createNewFromTemplate(String name, String type,
-            String subType) {
-        // Verify the extension is correct
-        if (!name.endsWith(EXTENSION)) {
-            name += EXTENSION;
-        }
-
-        // Get path to template file
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-        LocalizationContext tx = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE);
-        File templateFile = pathMgr.getFile(tx, TEMPLATES_PATH);
-
-        try {
-            // Set path to template file
-            Properties p = new Properties();
-            p.setProperty("file.resource.loader.path", templateFile.getPath());
-
-            // get velocity context
-            Velocity.init(p);
-            VelocityContext context = new VelocityContext();
-
-            String selectedTemplate = "";
-            if (type.compareTo(UTILITIES) == 0) {
-                // Choose the Utilities template
-                selectedTemplate = TEXT_UTILITY_TEMPLATES;
-            } else {
-                if (subType.compareTo(TABLE) == 0) {
-                    // Choose the Product Table template
-                    selectedTemplate = TEXT_PRODUCT_TABLE_TEMPLATES;
-                } else {
-                    // Choose the Product Smart template
-                    selectedTemplate = TEXT_PRODUCT_SMART_TEMPLATES;
-                }
-            }
-
-            // Retrieve template
-            Template template = null;
-            template = Velocity.getTemplate(selectedTemplate);
-
-            // set options for template
-            String author = LocalizationManager.getInstance().getCurrentUser();
-            context.put("author", author);
-            context.put("itemName", name.split(EXTENSION)[0]);
-
-            // Create the localization file
-            LocalizationFile localizationFile = newTextProductFile(name, type);
-
-            FileWriter fw = new FileWriter(localizationFile.getFile());
-
-            template.merge(context, fw);
-            fw.flush();
-            fw.close();
-
-            // Save the merged template to the server
-            localizationFile.save();
-
-            // Add new product or utility to the catalogue
-            TextProductCatalogue.getInstance().addEntry(name, localizationFile,
-                    type);
-
-            // Open new file in the Python editor
-            PythonUtil.openPythonFile(localizationFile);
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error creating new text product", e);
-        }
-
-    }
-
-    /**
-     * Prompts for a name for a new utility and creates it.
-     */
-    public static void promptForNewUtility() {
-        InputDialog dlg = new InputDialog(
-                Display.getCurrent().getActiveShell(), "New Text Utility",
-                "New Utility Name", "", null);
-        if (dlg.open() == Dialog.OK) {
-            String newName = dlg.getValue();
-
-            if (promptForOverwrite(newName, TextProductUtils.UTILITIES)) {
-                TextProductUtils.createNewFromTemplate(newName,
-                        TextProductUtils.UTILITIES, null);
-            }
-        }
-    }
-
     public static LocalizationLevel getLocalizationLevel(String entryName,
             String entryType) {
         return TextProductCatalogue.getInstance()
diff --git a/cave/build/static/common/cave/etc/gfe/testdata/CedarKey2010.txt b/cave/com.raytheon.viz.gfe/testdata/CedarKey2010.txt
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/testdata/CedarKey2010.txt
rename to cave/com.raytheon.viz.gfe/testdata/CedarKey2010.txt
diff --git a/cave/build/static/common/cave/etc/gfe/testdata/FortMyers2010.txt b/cave/com.raytheon.viz.gfe/testdata/FortMyers2010.txt
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/testdata/FortMyers2010.txt
rename to cave/com.raytheon.viz.gfe/testdata/FortMyers2010.txt
diff --git a/cave/build/static/common/cave/etc/gfe/testdata/SaintPetersburg2010.txt b/cave/com.raytheon.viz.gfe/testdata/SaintPetersburg2010.txt
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/testdata/SaintPetersburg2010.txt
rename to cave/com.raytheon.viz.gfe/testdata/SaintPetersburg2010.txt
diff --git a/cave/build/static/common/cave/etc/gfe/testdata/VeniceInlet2010.txt b/cave/com.raytheon.viz.gfe/testdata/VeniceInlet2010.txt
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/testdata/VeniceInlet2010.txt
rename to cave/com.raytheon.viz.gfe/testdata/VeniceInlet2010.txt
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
index eb0a043487..0c5e24fbd5 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
@@ -38,6 +38,7 @@ import com.raytheon.uf.common.util.FileUtil;
  * Sep 18, 2012      #1091 randerso    added base directory to getGfeConfigIncludePath
  * Feb 27, 2013      #1447 dgilling    Re-factor based on PythonPathIncludeUtil.
  * Mar 11, 2013      #1759 dgilling    Add method getGfeConfigLF().
+ * Sep 16, 2013      #1759 dgilling    Move tests and autotests to GfeCavePyIncludeUtil.
  * </pre>
  * 
  * @author njensen
@@ -52,14 +53,10 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
 
     public static final String ITOOL = FileUtil.join(GFE, "itool");
 
-    public static final String AUTO_TEST = FileUtil.join(GFE, "autotest");
-
     public static final String VTEC = "vtec";
 
     public static final String USER_PYTHON = FileUtil.join(GFE, "userPython");
 
-    public static final String TESTS = FileUtil.join(USER_PYTHON, "tests");
-
     public static final String CONFIG = FileUtil.join(USER_PYTHON, "gfeConfig");
 
     public static final String UTILITIES = FileUtil.join(USER_PYTHON,
@@ -131,10 +128,6 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
         return PATH_MANAGER.getLocalizationFile(ctx, ITOOL);
     }
 
-    public static LocalizationFile getAutotestLF(LocalizationContext ctx) {
-        return PATH_MANAGER.getLocalizationFile(ctx, AUTO_TEST);
-    }
-
     public static LocalizationFile getHeadlineLF(LocalizationContext ctx) {
         return PATH_MANAGER.getLocalizationFile(ctx, HEADLINE);
     }
@@ -148,10 +141,6 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
         return PATH_MANAGER.getLocalizationFile(ctx, COMBINATIONS);
     }
 
-    public static LocalizationFile getTestsLF(LocalizationContext ctx) {
-        return PATH_MANAGER.getLocalizationFile(ctx, TESTS);
-    }
-
     public static LocalizationFile getVCModUtilsLF(LocalizationContext ctx) {
         return PATH_MANAGER.getLocalizationFile(ctx, VCMOD_UTILS);
     }
@@ -317,11 +306,6 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
                 LocalizationLevel.BASE), ITOOL);
     }
 
-    public static String getAutotestIncludePath() {
-        return getPath(PATH_MANAGER.getContext(LocalizationType.CAVE_STATIC,
-                LocalizationLevel.BASE), AUTO_TEST);
-    }
-
     public static String getHeadlineIncludePath() {
         return getPath(PATH_MANAGER.getContext(LocalizationType.CAVE_STATIC,
                 LocalizationLevel.BASE), HEADLINE);
@@ -353,11 +337,6 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
         }
     }
 
-    public static String getTestsIncludePath() {
-        return getPath(PATH_MANAGER.getContext(LocalizationType.CAVE_STATIC,
-                LocalizationLevel.BASE), TESTS);
-    }
-
     public static String getIscScriptsIncludePath() {
         return getPath(PATH_MANAGER.getContext(LocalizationType.EDEX_STATIC,
                 LocalizationLevel.BASE), ISC);
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/TestHazardUtils.py b/tests/python/gfe/TestHazardUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/TestHazardUtils.py
rename to tests/python/gfe/TestHazardUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/MockGridData.py b/tests/python/gfe/mockObjects/MockGridData.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/MockGridData.py
rename to tests/python/gfe/mockObjects/MockGridData.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/MockGridInfo.py b/tests/python/gfe/mockObjects/MockGridInfo.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/MockGridInfo.py
rename to tests/python/gfe/mockObjects/MockGridInfo.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/MockHazardUtils.py b/tests/python/gfe/mockObjects/MockHazardUtils.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/MockHazardUtils.py
rename to tests/python/gfe/mockObjects/MockHazardUtils.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/MockParm.py b/tests/python/gfe/mockObjects/MockParm.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/MockParm.py
rename to tests/python/gfe/mockObjects/MockParm.py
diff --git a/cave/build/static/common/cave/etc/gfe/userPython/tests/MockSlice.py b/tests/python/gfe/mockObjects/MockSlice.py
similarity index 100%
rename from cave/build/static/common/cave/etc/gfe/userPython/tests/MockSlice.py
rename to tests/python/gfe/mockObjects/MockSlice.py