diff --git a/src/Makefile.common b/src/Makefile.common
index 57dc09fd..fa4b7ec3 100644
--- a/src/Makefile.common
+++ b/src/Makefile.common
@@ -177,7 +177,7 @@ output: $(MAKEFILE_LIST);
 
 # (Removed Cygwin stuff...)
 # Plotting command
-PLOTCMD ?= $(CLAW_PYTHON) $(VISCLAW)/src/python/visclaw/plotters/plotclaw.py
+PLOTCMD ?= $(CLAW_PYTHON) $(VISCLAW)/src/python/visclaw/plotclaw.py
 
 # Rule to make the plots into subdirectory specified by PLOT_DIR,
 # using data in subdirectory specified by OUT_DIR and the plotting
diff --git a/src/python/clawdata.py b/src/python/clawutil/clawdata.py
similarity index 100%
rename from src/python/clawdata.py
rename to src/python/clawutil/clawdata.py
diff --git a/src/python/setenv.py b/src/python/setenv.py
index 37ca39c8..9a01ff00 100755
--- a/src/python/setenv.py
+++ b/src/python/setenv.py
@@ -170,7 +170,8 @@ def write_env_files(claw_path,verbose=True,outfile_base="setenv",**kargs):
         write_environment_variable(csh_file,bash_file,"PYCLAW",available_projects["pyclaw"])
 
     if "clawapps" in available_projects:
-        raise NotImplementedError("Environment settings not implemented for clawapps!")
+        #raise NotImplementedError("Environment settings not implemented for clawapps!")
+        pass
 
     if "doc" in available_projects:
         pass