19 files changed, 97 insertions, 56 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 5e2a6461..df3c74f8 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -59,10 +59,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             this.eventManager.addEventListener("executeNewFile", this, false);
             this.eventManager.addEventListener("executeSave", this, false);
 
-            this.eventManager.addEventListener("recordStyleChanged", this, false);
-            
-            
-            
+            this.eventManager.addEventListener("recordStyleChanged", this, false);           
         }
     },
     
@@ -119,8 +116,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //TODO: Check for appropiate structures
     handleExecuteSave: {
         value: function(event) {
-                //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            if(!!this.activeDocument){
+                //Text and HTML document classes should return the same save object for fileSave
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
+            }
                 }
     },
     ////////////////////////////////////////////////////////////////////
@@ -460,5 +459,5 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             return "userDocument_" + (this._iframeCounter++);
         }
-        }
+    }
 });
diff --git a/js/document/text-document.js b/js/document/text-document.js
index 3e20e1f6..1132ba65 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -27,7 +27,7 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
         // PRIVATE MEMBERS
     _codeEditor: {
         value: {
-            "editor": { value: null, enumerable: false },
+            "editor": { value: null, enumerable: false }
 
         }
     },
@@ -192,5 +192,17 @@ var TextDocument = exports.TextDocument = Montage.create(Component, {
         value: function() {
             // Have the XHR here?
         }
+    },
+
+    markEdited:{
+        value: function() {
+            this.dirtyFlag = true;
+        }
+    },
+
+    markUnedited:{
+        value: function() {
+            this.dirtyFlag = false;
+        }
     }
 });
\ No newline at end of file
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index a75b59bb..2051da43 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1096,37 +1096,6 @@ exports.CoreIoApi = Montage.create(Component, {
             }
             return status;
         }
-    },
-
-        ////////////////////////////////////////////////////////////////////
-    /***
-     * check if the file exists
-     */
-    checkFileExists:{
-        value: function(fileName, folderUri, fileType){
-            var uri = "", response=null, status=true;
-
-            //prepare absolute uri
-            if(/[^/\\]$/g.test(folderUri)){
-                folderUri = folderUri + "/";
-            }
-
-            if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){
-                fileName = fileName+fileType;
-            }
-
-            uri = ""+folderUri+fileName;
-
-            response = this.fileExists({"uri":uri});
-            if(!!response && response.success && (response.status === 204)){
-                status = true;
-            }else if(!!response && response.success && (response.status === 404)){
-                status = false;
-            }else{
-                status = false;
-            }
-            return status;
-        }
     }
         ////////////////////////////////////////////////////////////////////
 });
diff --git a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.css b/js/io/ui/file-picker/file-input-field.reel/file-input-field.css
index 91e412f8..91e412f8 100755
--- a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.css
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.css
diff --git a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index 46dd5c69..2fcaa075 100755
--- a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
     {
         "owner":{
-            "module": "js/components/ui/FilePicker/file-input-field.reel",
+            "module": "js/io/ui/file-picker/file-input-field.reel",
             "name": "FileInputField",
             "properties": {
                 "element": {"#": "fileInputField"},
diff --git a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index 235be8ad..235be8ad 100755
--- a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
diff --git a/js/components/ui/FilePicker/file-picker-controller.js b/js/io/ui/file-picker/file-picker-controller.js
index 0ff20cc8..129bebad 100755
--- a/js/components/ui/FilePicker/file-picker-controller.js
+++ b/js/io/ui/file-picker/file-picker-controller.js
@@ -6,8 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 
 var Montage = require("montage/core/core").Montage,
-    pickerNavigatorReel = require("js/components/ui/FilePicker/pickerNavigator.reel").PickerNavigator,
-    filePickerModelModule = require("js/components/ui/FilePicker/file-picker-model"),
+    pickerNavigatorReel = require("js/io/ui/file-picker/picker-navigator.reel").PickerNavigator,
+    filePickerModelModule = require("js/io/ui/file-picker/file-picker-model"),
     Popup = require("montage/ui/popup/popup.reel").Popup;
 
 //singleton with functions to create a new file picker instance and utilities to format or filter the model data
diff --git a/js/components/ui/FilePicker/file-picker-model.js b/js/io/ui/file-picker/file-picker-model.js
index d9cf02ed..09c3ae9c 100755
--- a/js/components/ui/FilePicker/file-picker-model.js
+++ b/js/io/ui/file-picker/file-picker-model.js
@@ -4,7 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var filePickerControllerModule = require("js/components/ui/FilePicker/file-picker-controller");
+var filePickerControllerModule = require("js/io/ui/file-picker/file-picker-controller");
 
 //this is per file picker instance
 exports.FilePickerModel = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
index 796c283f..796c283f 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.css
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
index 20cb0c68..f46068ec 100755
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.html
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
@@ -7,11 +7,11 @@
 <html>
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="pickerNavigator.css">
+    <link rel="stylesheet" type="text/css" href="picker-navigator.css">
     <script type="text/montage-serialization">
         {
             "owner":{
-                "module": "js/components/ui/FilePicker/pickerNavigator.reel",
+                "module": "js/io/ui/file-picker/picker-navigator.reel",
                 "name":"PickerNavigator",
                 "properties":{
                     "element": {"#": "picker"},
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/io/ui/file-picker/picke