diff --git a/invesalius/control.py b/invesalius/control.py
index 01342bd..3484292 100755
--- a/invesalius/control.py
+++ b/invesalius/control.py
@@ -132,7 +132,7 @@ class Controller():
             proj = prj.Project()
             filepath = dialog.ShowSaveAsProjectDialog(proj.name)
             if filepath:
-                session.RemoveTemp()
+                #session.RemoveTemp()
                 session.OpenProject(filepath) 
             else:
                 return
diff --git a/invesalius/data/mask.py b/invesalius/data/mask.py
index 366a188..75b7cfe 100644
--- a/invesalius/data/mask.py
+++ b/invesalius/data/mask.py
@@ -43,12 +43,13 @@ class Mask():
     def SavePlist(self, filename):
         mask = {}
         filename = '%s$%s$%d' % (filename, 'mask', self.index)
+        
         d = self.__dict__
         for key in d:
             if isinstance(d[key], vtk.vtkImageData):
                 img_name = '%s_%s.vti' % (filename, key)
                 iu.Export(d[key], img_name, bin=True)
-                mask[key] = {'$vti': img_name}
+                mask[key] = {'$vti': os.path.split(img_name)[1]}
             elif key == 'edited_points':
                 edited_points = {}
                 for p in self.edited_points:
@@ -57,7 +58,7 @@ class Mask():
             else:
                 mask[key] = d[key]
         plistlib.writePlist(mask, filename + '.plist')
-        return filename + '.plist'
+        return os.path.split(filename)[1] + '.plist'
 
     def OpenPList(self, filename):
         mask = plistlib.readPlist(filename)
diff --git a/invesalius/data/surface.py b/invesalius/data/surface.py
index 9cda161..26605c6 100644
--- a/invesalius/data/surface.py
+++ b/invesalius/data/surface.py
@@ -54,11 +54,13 @@ class Surface():
             if isinstance(d[key], vtk.vtkPolyData):
                 img_name = '%s_%s.vtp' % (filename, key)
                 pu.Export(d[key], img_name, bin=True)
-                surface[key] = {'$vtp': img_name}
+                surface[key] = {'$vtp': os.path.split(img_name)[1]}
             else:
                 surface[key] = d[key]
+                
+                
         plistlib.writePlist(surface, filename + '.plist')
-        return filename + '.plist'
+        return os.path.split(filename)[1] + '.plist'
 
     def OpenPList(self, filename):
         surface = plistlib.readPlist(filename)
diff --git a/invesalius/presets.py b/invesalius/presets.py
index 20c340f..0aeb5d9 100644
--- a/invesalius/presets.py
+++ b/invesalius/presets.py
@@ -102,7 +102,7 @@ class Presets():
         preset['thresh_mri'] = self.thresh_mri.copy()
         preset['thresh_ct'] = self.thresh_ct.copy()
         plistlib.writePlist(preset, filename)
-        return filename
+        return os.path.split(filename)[1]
 
     def OpenPlist(self, filename):
         p = plistlib.readPlist(filename)
diff --git a/invesalius/project.py b/invesalius/project.py
index 2537117..547c756 100755
--- a/invesalius/project.py
+++ b/invesalius/project.py
@@ -185,12 +185,10 @@ class Project(object):
         project['mask_dict'] = masks
         img_file = '%s_%s.vti' % (filename_tmp, 'imagedata')
         iu.Export(self.imagedata, img_file, bin=True)
-        project['imagedata'] = {'$vti':img_file}
-        print project
+        project['imagedata'] = {'$vti':os.path.split(img_file)[1]}
         plistlib.writePlist(project, filename_tmp + '.plist')
         
         path = os.path.join(dir_,filename)
-        print path
         Compress(dir_temp, path)#os.path.join("~/Desktop/","teste.inv3"))
         shutil.rmtree(dir_temp)
 
@@ -248,12 +246,18 @@ class Project(object):
 
 
 def Compress(folder, filename):
-    file_list = glob.glob(os.path.join(folder,"*"))
-    tar = tarfile.open(filename, "w:gz")
+    tmpdir, tmpdir_ = os.path.split(folder)
+    current_dir = os.path.abspath(".")
+    os.chdir(tmpdir)
+    file_list = glob.glob(os.path.join(tmpdir_,"*"))
+    
+    tar = tarfile.open(tmpdir_ + ".inv3", "w:gz")
     for name in file_list:
         tar.add(name)
     tar.close()
-
+    shutil.move(tmpdir_+ ".inv3", filename)
+    os.chdir(current_dir)
+    
 def Extract(filename, folder):
     tar = tarfile.open(filename, "r:gz")
     #tar.list(verbose=True)
--
libgit2 0.21.2