diff --git a/Application/index.ts b/Application/index.ts
deleted file mode 100644
index 0996e50e3..000000000
--- a/Application/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("Application/application");
\ No newline at end of file
diff --git a/BCL.csproj b/BCL.csproj
index f48b4dca4..cc7550609 100644
--- a/BCL.csproj
+++ b/BCL.csproj
@@ -77,66 +77,67 @@
-
+
application.d.ts
-
+
application.d.ts
-
-
+
+
application.d.ts
-
+
console.d.ts
-
+
console_helper.d.ts
-
-
+
+
console_helper.d.ts
declarations.d.ts
-
+
camera.d.ts
-
-
+
+
camera.d.ts
declarations.d.ts
-
-
+
+
file_system.d.ts
-
+
file_system_access.d.ts
-
-
+
+
file_system_access.d.ts
-
+
image.d.ts
-
+
+
image.d.ts
-
-
+
+
location.d.ts
-
-
+
+
location.d.ts
-
+
location.d.ts
@@ -153,16 +154,9 @@
text.d.ts
-
- user_preferences.d.ts
-
-
-
- user_preferences.d.ts
-
-
-
-
+
+
+
http_request.d.ts
@@ -173,13 +167,11 @@
-
-
-
-
-
-
-
+
+
+
+
+
@@ -190,21 +182,28 @@
timer.d.ts
-
- user_preferences.d.ts
-
-
+
timer.d.ts
-
+
+
+
+
+ local_settings.d.ts
+
+
+
+ local_settings.d.ts
+
+
+ local_settings.d.ts
+
-
-
@@ -213,17 +212,17 @@
-
+
-
+
-
+
@@ -237,6 +236,9 @@
+
+
+
commonjs
True
diff --git a/Console/index.ts b/Console/index.ts
deleted file mode 100644
index e4bd6c6a5..000000000
--- a/Console/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("Console/console");
\ No newline at end of file
diff --git a/FileSystem/index.ts b/FileSystem/index.ts
deleted file mode 100644
index c9093dbef..000000000
--- a/FileSystem/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("FileSystem/file_system");
\ No newline at end of file
diff --git a/Image/index.ts b/Image/index.ts
deleted file mode 100644
index e390041b0..000000000
--- a/Image/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("Image/image");
\ No newline at end of file
diff --git a/Location/index.ts b/Location/index.ts
deleted file mode 100644
index 9a554aa9d..000000000
--- a/Location/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("Location/location");
\ No newline at end of file
diff --git a/Tests/file_system_tests.ts b/Tests/file_system_tests.ts
index 8288ffd17..4646a7839 100644
--- a/Tests/file_system_tests.ts
+++ b/Tests/file_system_tests.ts
@@ -3,7 +3,7 @@
// # File System
// Using the file system requires the FileSystem module.
// ``` JavaScript
-var fs = require("FileSystem");
+var fs = require("filesystem");
// ```
// The pre-required `fs` module is used throughout the following code snippets.
//
diff --git a/Tests/local_settings_tests.ts b/Tests/local_settings_tests.ts
new file mode 100644
index 000000000..67678b458
--- /dev/null
+++ b/Tests/local_settings_tests.ts
@@ -0,0 +1,137 @@
+
+var TKUnit = require("Tests/TKUnit");
+var LocalSettings = require("localsettings");
+
+var stringKey:string = "stringKey";
+var boolKey: string = "boolKey";
+var numberKey: string = "numberKey";
+var noStringKey: string = "noStringKey";
+var noBoolKey: string = "noBoolKey";
+var noNumberKey: string = "noNumberKey";
+
+export var testBoolean = function () {
+ LocalSettings.setBoolean(boolKey, false);
+ TKUnit.assert(false == LocalSettings.getBoolean(boolKey), "Cannot set boolean to false, currently it is: " + LocalSettings.getBoolean(boolKey));
+
+ LocalSettings.setBoolean(boolKey, true);
+ TKUnit.assert(true == LocalSettings.getBoolean(boolKey, false), "Cannot set boolean to true");
+
+ TKUnit.assert(true == LocalSettings.getBoolean(boolKey), "Cannot set boolean to true (no default)");
+};
+
+export var testString = function () {
+ LocalSettings.setString(stringKey, "String value");
+ TKUnit.assert("String value" === LocalSettings.getString(stringKey), "Cannot set string value");
+};
+
+export var testNumber = function () {
+ LocalSettings.setNumber(numberKey, 54.321);
+ var value = LocalSettings.getNumber(numberKey).toFixed(3);
+ TKUnit.assert(54.321 == value, "Cannot set number value 54.321 != " + value);
+};
+
+export var testDefaults = function () {
+ TKUnit.assert("No string value" === LocalSettings.getString(noStringKey, "No string value"), "Bad default string value");
+ TKUnit.assert(true === LocalSettings.getBoolean(noBoolKey, true), "Bad default boolean value");
+ TKUnit.assert(123.45 === LocalSettings.getNumber(noNumberKey, 123.45), "Bad default number value");
+};
+
+export var testHasKey = function () {
+ TKUnit.assert(!LocalSettings.hasKey(noBoolKey), "There is a key: " + noBoolKey);
+ TKUnit.assert(!LocalSettings.hasKey(noStringKey), "There is a key: " + noStringKey);
+ TKUnit.assert(!LocalSettings.hasKey(noNumberKey), "There is a key: " + noNumberKey);
+
+ TKUnit.assert(LocalSettings.hasKey(boolKey), "There is no key: " + boolKey);
+ TKUnit.assert(LocalSettings.hasKey(stringKey), "There is no key: " + stringKey);
+ TKUnit.assert(LocalSettings.hasKey(numberKey), "There is no key: " + numberKey);
+};
+
+export var testRemove = function () {
+ LocalSettings.remove(boolKey);
+ TKUnit.assert(!LocalSettings.hasKey(boolKey), "Failed to remove key: " + boolKey);
+
+ LocalSettings.remove(stringKey);
+ TKUnit.assert(!LocalSettings.hasKey(stringKey), "Failed to remove key: " + stringKey);
+
+ LocalSettings.remove(numberKey);
+ TKUnit.assert(!LocalSettings.hasKey(numberKey), "Failed to remove key: " + numberKey);
+};
+
+export var testInvalidKey = function () {
+ try {
+ LocalSettings.hasKey(undefined);
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.hasKey(null);
+ TKUnit.assert(false, "There is a key null");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.hasKey(123);
+ TKUnit.assert(false, "There is a key number");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ LocalSettings.hasKey("string");
+};
+
+export var testInvalidValue = function () {
+ try {
+ LocalSettings.setBoolean(boolKey, "str");
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.setBoolean(boolKey, 123);
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.setString(boolKey, true);
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.setString(boolKey, 123);
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.setNumber(boolKey, true);
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+ try {
+ LocalSettings.setNumber(boolKey, "123");
+ TKUnit.assert(false, "There is a key undefined");
+ }
+ catch (e) {
+ // we should receive an exception here
+ }
+
+};
diff --git a/Tests/location_tests.ts b/Tests/location_tests.ts
index 54e1409c3..159506de0 100644
--- a/Tests/location_tests.ts
+++ b/Tests/location_tests.ts
@@ -1,5 +1,5 @@
import TKUnit = require("Tests/TKUnit");
-import locationModule = require("Location/location");
+import locationModule = require("location/location");
var LocationManager = locationModule.LocationManager;
var Location = locationModule.Location;
diff --git a/Tests/testRunner.ts b/Tests/testRunner.ts
index 0c3ab45cd..98fe21038 100644
--- a/Tests/testRunner.ts
+++ b/Tests/testRunner.ts
@@ -2,11 +2,11 @@
var fsTests = require("Tests/file_system_tests");
var httpTests = require("Tests/http_tests");
var locationTests = require("Tests/location_tests");
-var userPreferencesTests = require("Tests/user_preferences_tests");
+var localSettingsTests = require("Tests/local_settings_tests");
export var runAll = function () {
TKUnit.runTestModule(fsTests, "FILE SYSTEM");
TKUnit.runTestModule(httpTests, "HTTP");
TKUnit.runTestModule(locationTests, "LOCATION");
- TKUnit.runTestModule(userPreferencesTests, "USER PREFERENCES");
+ TKUnit.runTestModule(localSettingsTests, "LOCAL SETTINGS");
}
diff --git a/Tests/user_preferences_tests.ts b/Tests/user_preferences_tests.ts
deleted file mode 100644
index 75b235eef..000000000
--- a/Tests/user_preferences_tests.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-
-var TKUnit = require("Tests/TKUnit");
-var UserPreferences = require("UserPreferences");
-
-var stringKey:string = "stringKey";
-var boolKey: string = "boolKey";
-var numberKey: string = "numberKey";
-var noStringKey: string = "noStringKey";
-var noBoolKey: string = "noBoolKey";
-var noNumberKey: string = "noNumberKey";
-
-export var testBoolean = function () {
- UserPreferences.setBoolean(boolKey, false);
- TKUnit.assert(false == UserPreferences.getBoolean(boolKey), "Cannot set boolean to false, currently it is: " + UserPreferences.getBoolean(boolKey));
-
- UserPreferences.setBoolean(boolKey, true);
- TKUnit.assert(true == UserPreferences.getBoolean(boolKey, false), "Cannot set boolean to true");
-
- TKUnit.assert(true == UserPreferences.getBoolean(boolKey), "Cannot set boolean to true (no default)");
-};
-
-export var testString = function () {
- UserPreferences.setString(stringKey, "String value");
- TKUnit.assert("String value" === UserPreferences.getString(stringKey), "Cannot set string value");
-};
-
-export var testNumber = function () {
- UserPreferences.setNumber(numberKey, 54.321);
- var value = UserPreferences.getNumber(numberKey).toFixed(3);
- TKUnit.assert(54.321 == value, "Cannot set number value 54.321 != " + value);
-};
-
-export var testDefaults = function () {
- TKUnit.assert("No string value" === UserPreferences.getString(noStringKey, "No string value"), "Bad default string value");
- TKUnit.assert(true === UserPreferences.getBoolean(noBoolKey, true), "Bad default boolean value");
- TKUnit.assert(123.45 === UserPreferences.getNumber(noNumberKey, 123.45), "Bad default number value");
-};
-
-export var testHasKey = function () {
- TKUnit.assert(!UserPreferences.hasKey(noBoolKey), "There is a key: " + noBoolKey);
- TKUnit.assert(!UserPreferences.hasKey(noStringKey), "There is a key: " + noStringKey);
- TKUnit.assert(!UserPreferences.hasKey(noNumberKey), "There is a key: " + noNumberKey);
-
- TKUnit.assert(UserPreferences.hasKey(boolKey), "There is no key: " + boolKey);
- TKUnit.assert(UserPreferences.hasKey(stringKey), "There is no key: " + stringKey);
- TKUnit.assert(UserPreferences.hasKey(numberKey), "There is no key: " + numberKey);
-};
-
-export var testRemove = function () {
- UserPreferences.remove(boolKey);
- TKUnit.assert(!UserPreferences.hasKey(boolKey), "Failed to remove key: " + boolKey);
-
- UserPreferences.remove(stringKey);
- TKUnit.assert(!UserPreferences.hasKey(stringKey), "Failed to remove key: " + stringKey);
-
- UserPreferences.remove(numberKey);
- TKUnit.assert(!UserPreferences.hasKey(numberKey), "Failed to remove key: " + numberKey);
-};
-
-export var testInvalidKey = function () {
- try {
- UserPreferences.hasKey(undefined);
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.hasKey(null);
- TKUnit.assert(false, "There is a key null");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.hasKey(123);
- TKUnit.assert(false, "There is a key number");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- UserPreferences.hasKey("string");
-};
-
-export var testInvalidValue = function () {
- try {
- UserPreferences.setBoolean(boolKey, "str");
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.setBoolean(boolKey, 123);
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.setString(boolKey, true);
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.setString(boolKey, 123);
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.setNumber(boolKey, true);
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
- try {
- UserPreferences.setNumber(boolKey, "123");
- TKUnit.assert(false, "There is a key undefined");
- }
- catch (e) {
- // we should receive an exception here
- }
-
-};
diff --git a/UserPreferences/index.ts b/UserPreferences/index.ts
deleted file mode 100644
index d26af64aa..000000000
--- a/UserPreferences/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-declare var module, require;
-module.exports = require("UserPreferences/user_preferences");
\ No newline at end of file
diff --git a/Application/Readme.md b/application/Readme.md
similarity index 100%
rename from Application/Readme.md
rename to application/Readme.md
diff --git a/Application/application.android.ts b/application/application.android.ts
similarity index 97%
rename from Application/application.android.ts
rename to application/application.android.ts
index e8f331e8a..0f6ba8afa 100644
--- a/Application/application.android.ts
+++ b/application/application.android.ts
@@ -1,8 +1,8 @@
-import appModule = require("Application/application_common");
+import appModule = require("application/application_common");
// merge the exports of the application_common file with the exports of this file
declare var exports;
-require("Utils/module_merge").merge(appModule, exports);
+require("utils/module_merge").merge(appModule, exports);
var callbacks = android.app.Application.ActivityLifecycleCallbacks;
diff --git a/Application/application.d.ts b/application/application.d.ts
similarity index 100%
rename from Application/application.d.ts
rename to application/application.d.ts
diff --git a/Application/application.ios.ts b/application/application.ios.ts
similarity index 96%
rename from Application/application.ios.ts
rename to application/application.ios.ts
index fcc1ec841..7c57a053c 100644
--- a/Application/application.ios.ts
+++ b/application/application.ios.ts
@@ -20,11 +20,11 @@ log("JavaScript loading ended.");
*/
-import appModule = require("Application/application_common");
+import appModule = require("application/application_common");
// merge the exports of the application_common file with the exports of this file
declare var exports;
-require("Utils/module_merge").merge(appModule, exports);
+require("utils/module_merge").merge(appModule, exports);
// TODO: Declarations
export var init = function (nativeApp: any) {
diff --git a/Application/application_common.ts b/application/application_common.ts
similarity index 100%
rename from Application/application_common.ts
rename to application/application_common.ts
diff --git a/application/index.ts b/application/index.ts
new file mode 100644
index 000000000..b47c3fb54
--- /dev/null
+++ b/application/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("application/application");
\ No newline at end of file
diff --git a/Camera/camera.android.ts b/camera/camera.android.ts
similarity index 95%
rename from Camera/camera.android.ts
rename to camera/camera.android.ts
index 2ba1bc140..06a08cd46 100644
--- a/Camera/camera.android.ts
+++ b/camera/camera.android.ts
@@ -1,4 +1,4 @@
-import appModule = require("Application/application");
+import appModule = require("application/application");
var REQUEST_IMAGE_CAPTURE: number = 1;
var REQUEST_SELECT_PICTURE: number = 2;
diff --git a/Camera/camera.d.ts b/camera/camera.d.ts
similarity index 100%
rename from Camera/camera.d.ts
rename to camera/camera.d.ts
diff --git a/Camera/camera.ios.ts b/camera/camera.ios.ts
similarity index 100%
rename from Camera/camera.ios.ts
rename to camera/camera.ios.ts
diff --git a/Camera/index.ts b/camera/index.ts
similarity index 100%
rename from Camera/index.ts
rename to camera/index.ts
diff --git a/Console/Readme.md b/console/Readme.md
similarity index 100%
rename from Console/Readme.md
rename to console/Readme.md
diff --git a/Console/console.d.ts b/console/console.d.ts
similarity index 100%
rename from Console/console.d.ts
rename to console/console.d.ts
diff --git a/Console/console.ts b/console/console.ts
similarity index 99%
rename from Console/console.ts
rename to console/console.ts
index 42421a1dc..1f7494fa4 100644
--- a/Console/console.ts
+++ b/console/console.ts
@@ -1,4 +1,4 @@
-import helperModule = require("Console/console_helper");
+import helperModule = require("console/console_helper");
export class Console {
private _timers: any;
diff --git a/Console/console_helper.android.ts b/console/console_helper.android.ts
similarity index 100%
rename from Console/console_helper.android.ts
rename to console/console_helper.android.ts
diff --git a/Console/console_helper.d.ts b/console/console_helper.d.ts
similarity index 100%
rename from Console/console_helper.d.ts
rename to console/console_helper.d.ts
diff --git a/Console/console_helper.ios.ts b/console/console_helper.ios.ts
similarity index 100%
rename from Console/console_helper.ios.ts
rename to console/console_helper.ios.ts
diff --git a/console/index.ts b/console/index.ts
new file mode 100644
index 000000000..48eb07a29
--- /dev/null
+++ b/console/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("console/console");
\ No newline at end of file
diff --git a/FileSystem/file_system.d.ts b/filesystem/file_system.d.ts
similarity index 100%
rename from FileSystem/file_system.d.ts
rename to filesystem/file_system.d.ts
diff --git a/FileSystem/file_system.ts b/filesystem/file_system.ts
similarity index 99%
rename from FileSystem/file_system.ts
rename to filesystem/file_system.ts
index 41720b90e..9fae4c1eb 100644
--- a/FileSystem/file_system.ts
+++ b/filesystem/file_system.ts
@@ -1,4 +1,4 @@
-import file_access_module = require("FileSystem/file_system_access");
+import file_access_module = require("filesystem/file_system_access");
import promises = require("promises/promises");
// The FileSystemAccess implementation, used through all the APIs.
diff --git a/FileSystem/file_system_access.android.ts b/filesystem/file_system_access.android.ts
similarity index 99%
rename from FileSystem/file_system_access.android.ts
rename to filesystem/file_system_access.android.ts
index 2ffcfd5a7..07ed83b3b 100644
--- a/FileSystem/file_system_access.android.ts
+++ b/filesystem/file_system_access.android.ts
@@ -1,4 +1,4 @@
-import appModule = require("Application/application");
+import appModule = require("application/application");
import textModule = require("text/text");
export class FileSystemAccess {
diff --git a/FileSystem/file_system_access.d.ts b/filesystem/file_system_access.d.ts
similarity index 100%
rename from FileSystem/file_system_access.d.ts
rename to filesystem/file_system_access.d.ts
diff --git a/FileSystem/file_system_access.ios.ts b/filesystem/file_system_access.ios.ts
similarity index 99%
rename from FileSystem/file_system_access.ios.ts
rename to filesystem/file_system_access.ios.ts
index 5c7bda2a0..f7e78932c 100644
--- a/FileSystem/file_system_access.ios.ts
+++ b/filesystem/file_system_access.ios.ts
@@ -1,5 +1,5 @@
-import app_module = require("Application/application");
-import utilsModule = require("Utils/utils_ios");
+import app_module = require("application/application");
+import utilsModule = require("utils/utils_ios");
import textModule = require("text/text");
// TODO: Implement all the APIs receiving callback using async blocks
diff --git a/filesystem/index.ts b/filesystem/index.ts
new file mode 100644
index 000000000..0af49ea2a
--- /dev/null
+++ b/filesystem/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("fileSystem/file_system");
\ No newline at end of file
diff --git a/globals/index.ts b/globals/index.ts
index b908946b8..60fc021eb 100644
--- a/globals/index.ts
+++ b/globals/index.ts
@@ -1,6 +1,6 @@
declare var setTimeout, clearTimeout, setInterval, clearInterval;
import timer = require("timer/timer");
-import consoleModule = require("Console/console");
+import consoleModule = require("console/console");
setTimeout = timer.setTimeout;
clearTimeout = timer.clearTimeout;
diff --git a/http/http.ts b/http/http.ts
index 19031681d..7d239c53d 100644
--- a/http/http.ts
+++ b/http/http.ts
@@ -1,4 +1,4 @@
-import image_module = require("Image/image");
+import image_module = require("image/image");
import promises = require("promises/promises");
import http = require("http/http_request");
diff --git a/http/http_request.d.ts b/http/http_request.d.ts
index 143e5cb08..8fc95e612 100644
--- a/http/http_request.d.ts
+++ b/http/http_request.d.ts
@@ -1,7 +1,7 @@
/**
* The http client interface.
*/
-import image_module = require("Image/image");
+import image_module = require("image/image");
import promises = require("promises/promises");
export declare function request(options: HttpRequestOptions): promises.Promise;
diff --git a/Image/Readme.md b/image/Readme.md
similarity index 100%
rename from Image/Readme.md
rename to image/Readme.md
diff --git a/Image/image.android.ts b/image/image.android.ts
similarity index 97%
rename from Image/image.android.ts
rename to image/image.android.ts
index fee065f60..3699d301f 100644
--- a/Image/image.android.ts
+++ b/image/image.android.ts
@@ -1,4 +1,4 @@
-import appModule = require("Application/application");
+import appModule = require("application/application");
export enum ImageFormat {
PNG,
diff --git a/Image/image.d.ts b/image/image.d.ts
similarity index 100%
rename from Image/image.d.ts
rename to image/image.d.ts
diff --git a/Image/image.ios.ts b/image/image.ios.ts
similarity index 100%
rename from Image/image.ios.ts
rename to image/image.ios.ts
diff --git a/image/index.ts b/image/index.ts
new file mode 100644
index 000000000..8c7abb23f
--- /dev/null
+++ b/image/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("image/image");
\ No newline at end of file
diff --git a/UserPreferences/Readme.md b/localsettings/Readme.md
similarity index 100%
rename from UserPreferences/Readme.md
rename to localsettings/Readme.md
diff --git a/localsettings/index.ts b/localsettings/index.ts
new file mode 100644
index 000000000..5ea4780f1
--- /dev/null
+++ b/localsettings/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("localsettings/local_settings");
\ No newline at end of file
diff --git a/UserPreferences/user_preferences.android.ts b/localsettings/local_settings.android.ts
similarity index 96%
rename from UserPreferences/user_preferences.android.ts
rename to localsettings/local_settings.android.ts
index defdac4ff..dd2069e28 100644
--- a/UserPreferences/user_preferences.android.ts
+++ b/localsettings/local_settings.android.ts
@@ -1,5 +1,5 @@
-import appModule = require("Application/application");
-import Common = require("UserPreferences/user_preferences_common");
+import appModule = require("application/application");
+import Common = require("localsettings/local_settings_common");
var sharedPreferences = appModule.android.context.getSharedPreferences("prefs.db", 0);
diff --git a/UserPreferences/user_preferences.d.ts b/localsettings/local_settings.d.ts
similarity index 100%
rename from UserPreferences/user_preferences.d.ts
rename to localsettings/local_settings.d.ts
diff --git a/UserPreferences/user_preferences.ios.ts b/localsettings/local_settings.ios.ts
similarity index 97%
rename from UserPreferences/user_preferences.ios.ts
rename to localsettings/local_settings.ios.ts
index 369f4810b..6d6e8c740 100644
--- a/UserPreferences/user_preferences.ios.ts
+++ b/localsettings/local_settings.ios.ts
@@ -1,4 +1,4 @@
-import Common = require("UserPreferences/user_preferences_common");
+import Common = require("localsettings/local_settings_common");
var userDefaults = Foundation.NSUserDefaults.standardUserDefaults();
diff --git a/UserPreferences/user_preferences_common.ts b/localsettings/local_settings_common.ts
similarity index 100%
rename from UserPreferences/user_preferences_common.ts
rename to localsettings/local_settings_common.ts
diff --git a/Location/Readme.md b/location/Readme.md
similarity index 100%
rename from Location/Readme.md
rename to location/Readme.md
diff --git a/location/index.ts b/location/index.ts
new file mode 100644
index 000000000..03634b8bb
--- /dev/null
+++ b/location/index.ts
@@ -0,0 +1,2 @@
+declare var module, require;
+module.exports = require("location/location");
\ No newline at end of file
diff --git a/Location/location.android.ts b/location/location.android.ts
similarity index 97%
rename from Location/location.android.ts
rename to location/location.android.ts
index 5f64d4a28..f33682448 100644
--- a/Location/location.android.ts
+++ b/location/location.android.ts
@@ -1,9 +1,9 @@
-import types = require("Location/location_types");
-import appModule = require("Application/application");
+import types = require("location/location_types");
+import appModule = require("application/application");
// merge the exports of the types module with the exports of this file
declare var exports;
-require("Utils/module_merge").merge(types, exports);
+require("utils/module_merge").merge(types, exports);
export class LocationManager {
// in meters
diff --git a/Location/location.d.ts b/location/location.d.ts
similarity index 100%
rename from Location/location.d.ts
rename to location/location.d.ts
diff --git a/Location/location.ios.ts b/location/location.ios.ts
similarity index 98%
rename from Location/location.ios.ts
rename to location/location.ios.ts
index 0220a5005..5a25000ae 100644
--- a/Location/location.ios.ts
+++ b/location/location.ios.ts
@@ -1,8 +1,8 @@
-import types = require("Location/location_types");
+import types = require("location/location_types");
// merge the exports of the types module with the exports of this file
declare var exports;
-require("Utils/module_merge").merge(types, exports);
+require("utils/module_merge").merge(types, exports);
export class LocationManager {
diff --git a/Location/location_types.ts b/location/location_types.ts
similarity index 100%
rename from Location/location_types.ts
rename to location/location_types.ts
diff --git a/Utils/module_merge.ts b/utils/module_merge.ts
similarity index 100%
rename from Utils/module_merge.ts
rename to utils/module_merge.ts
diff --git a/Utils/utils_android.ts b/utils/utils_android.ts
similarity index 100%
rename from Utils/utils_android.ts
rename to utils/utils_android.ts
diff --git a/Utils/utils_ios.ts b/utils/utils_ios.ts
similarity index 100%
rename from Utils/utils_ios.ts
rename to utils/utils_ios.ts