Index: wflow-py/wflow/wflow_floodmap.py
===================================================================
diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -reeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7
--- wflow-py/wflow/wflow_floodmap.py	(.../wflow_floodmap.py)	(revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42)
+++ wflow-py/wflow/wflow_floodmap.py	(.../wflow_floodmap.py)	(revision eeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7)
@@ -96,13 +96,14 @@
       
       """
       DynamicModel.__init__(self)   
-      setclone(Dir + "/staticmaps/" + cloneMap)
-      self.runId=RunDir      
-      self.caseName=Dir
-      self.Dir = Dir
+
+      self.caseName = os.path.abspath(Dir)
+      self.clonemappath = os.path.join(os.path.abspath(Dir),"staticmaps",cloneMap)
+      setclone(self.clonemappath)
+      self.runId = RunDir
+      self.Dir = os.path.abspath(Dir)
       self.configfile = configfile
-      self.SaveDir = self.Dir + "/" + self.runId + "/"
-     
+      self.SaveDir = os.path.join(self.Dir,self.runId)
 
 
   def stateVariables(self):
@@ -154,14 +155,14 @@
     #: here which will suspend the variables that are given by stateVariables 
     #: function.
     self.logger.info("Saving initial conditions...")
-    self.wf_suspend(self.SaveDir + "/outstate/")
+    self.wf_suspend(os.path.join(self.SaveDir , "outstate"))
 
     if self.fewsrun:
         self.logger.info("Saving initial conditions for FEWS...")
-        self.wf_suspend(self.Dir + "/outstate/")
+        self.wf_suspend(os.path.join(self.Dir , "outstate"))
         
-    report(ifthen(self.MaxDepth >0.0,self.MaxDepth),self.SaveDir + "/outsum/MaxDepth.map")
-    report(ifthen(scalar(self.MaxExt) > 0.0,self.MaxExt),self.SaveDir + "/outsum/MaxExt.map")
+    report(ifthen(self.MaxDepth >0.0,self.MaxDepth),os.path.join(self.SaveDir , "outsum","MaxDepth.map"))
+    report(ifthen(scalar(self.MaxExt) > 0.0,self.MaxExt),os.path.join(self.SaveDir, "outsum","MaxExt.map"))
 
       
   def initial(self):
@@ -224,7 +225,7 @@
         self.logger.info("Setting initial conditions to default (zero)")
         self.FloodExtent=cover(boolean(0))
     else:
-        self.wf_resume(self.Dir + "/instate/")    
+        self.wf_resume(os.path.join(self.Dir , "instate"))
 
 
     
Index: wflow-py/wflow/wflow_gr4.py
===================================================================
diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -reeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7
--- wflow-py/wflow/wflow_gr4.py	(.../wflow_gr4.py)	(revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42)
+++ wflow-py/wflow/wflow_gr4.py	(.../wflow_gr4.py)	(revision eeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7)
@@ -161,16 +161,18 @@
       may be added by you if needed.
       
       """
-      DynamicModel.__init__(self)   
-      setclone(Dir + "/staticmaps/" + cloneMap)
-      self.runId=RunDir      
-      self.caseName=Dir
-      self.Dir = Dir
+      DynamicModel.__init__(self)
+
+      self.caseName = os.path.abspath(Dir)
+      self.clonemappath = os.path.join(os.path.abspath(Dir),"staticmaps",cloneMap)
+      setclone(self.clonemappath)
+      self.runId = RunDir
+      self.Dir = os.path.abspath(Dir)
       self.configfile = configfile
-      self.SaveDir = self.Dir + "/" + self.runId + "/"
-     
+      self.SaveDir = os.path.join(self.Dir,self.runId)
 
 
+
   def stateVariables(self):
       """ 
       returns a list of state variables that are essential to the model. 
@@ -220,16 +222,16 @@
     """
         
     self.logger.info("Saving initial conditions...")
-    self.wf_suspend(self.SaveDir + "/outstate/")
+    self.wf_suspend(os.path.join(self.SaveDir, "outstate"))
    
     if self.OverWriteInit:            
         self.logger.info("Saving initial conditions over start conditions...")
-        self.wf_suspend(self.SaveDir + "/instate/")
+        self.wf_suspend(os.path.join(self.SaveDir , "/instate"))
 
 
     if self.fewsrun:
         self.logger.info("Saving initial conditions for FEWS...")
-        self.wf_suspend(self.Dir + "/outstate/")
+        self.wf_suspend(os.path.join(self.Dir , "outstate"))
 
       
   def initial(self):
@@ -337,7 +339,7 @@
         self.QUH1 = mk_qres(self.NH)
         self.QUH2 = mk_qres(self.NH * 2)
     else:
-        self.wf_resume(self.Dir + "/instate/")    
+        self.wf_resume(os.path.join(self.Dir, "instate"))
 
 
   def dynamic(self):
Index: wflow-py/wflow/wflow_hbv.py
===================================================================
diff -u -r8259aa998aa7c6d7fcec17bcbc1a805198642b45 -reeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7
--- wflow-py/wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision 8259aa998aa7c6d7fcec17bcbc1a805198642b45)
+++ wflow-py/wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision eeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7)
@@ -92,6 +92,8 @@
 import shutil, glob
 import getopt
 
+from  wflow.wf_DynamicFramework import *
+
 try:
     from  wflow.wf_DynamicFramework import *
 except ImportError:
Index: wflow-py/wflow/wflow_wave.py
===================================================================
diff -u -rbcfa3db98112744a480253f1f934f647f5f7cd17 -reeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7
--- wflow-py/wflow/wflow_wave.py	(.../wflow_wave.py)	(revision bcfa3db98112744a480253f1f934f647f5f7cd17)
+++ wflow-py/wflow/wflow_wave.py	(.../wflow_wave.py)	(revision eeae35e7fcd1dc2d92db4fca33d0b2ca26300ec7)
@@ -135,16 +135,18 @@
       Initialize the object
       
       """
-      DynamicModel.__init__(self)   
-      setclone(os.path.join(Dir,"staticmaps",cloneMap))
-      self.runId=RunDir      
-      self.caseName=Dir
-      self.Dir = Dir
-      self.configfile = configfile
-      self.SaveDir = self.Dir + "/" + self.runId + "/"
       self.thestep=0
-     
+      DynamicModel.__init__(self)
 
+      self.caseName = os.path.abspath(Dir)
+      self.clonemappath = os.path.join(os.path.abspath(Dir),"staticmaps",cloneMap)
+      setclone(self.clonemappath)
+      self.runId = RunDir
+      self.Dir = os.path.abspath(Dir)
+      self.configfile = configfile
+      self.SaveDir = os.path.join(self.Dir,self.runId)
+
+
   def runDynamicWave(self):
         """
         Runs the dynamic wave for the main river
@@ -280,7 +282,7 @@
 
     if self.fewsrun:
         self.logger.info("Saving initial conditions for FEWS...")
-        self.wf_suspend(self.Dir + "/outstate/")
+        self.wf_suspend(os.path.join(self.Dir , "outstate"))
 
       
   def initial(self):
@@ -398,7 +400,7 @@
         self.SurfaceRunoffDyn=self.ZeroMap * scalar(boolean(self.River))        
 
     else:
-        self.wf_resume(self.Dir + "/instate/")    
+        self.wf_resume(os.path.join(self.Dir, "instate"))