Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r052c794d6a8db55a2fbfdad172275af073ee54c3
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 13d6a4fae2f910ab6e289ac9280258a94f734405)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 052c794d6a8db55a2fbfdad172275af073ee54c3)
@@ -32,7 +32,7 @@
 #ifdef BUILD_FOR_TARGET
     const char  *USB_Mount_Point = "/media/usb/";
 #else
-    const char  *USB_Mount_Point = "/media/denali/usb-disk/";
+    const char  *USB_Mount_Point = "/home/denali/Desktop/usb-disk/";
 #endif
 
     const char  *USB_File_System = "vfat";
@@ -43,15 +43,11 @@
     const char  *SDCard_Base_Path_Name = "/media/sd-card/";
 #else
     // should not be in the project application folder. [not tracking by git]
-    const char  *SDCard_Base_Path_Name = "/media/denali/sd-card/";
+    const char  *SDCard_Base_Path_Name = "/home/denali/Desktop/sd-card/";
 #endif
 
-    // Screenshot store folder
-#ifdef BUILD_FOR_TARGET
-    const char *Screenshot_Base_Path_Name = "/home/root/screenshots/";
-#else
-    const char *Screenshot_Base_Path_Name = "/home/denali/Desktop/Screenshots/";
-#endif
+// Screenshot store folder
+const char *Screenshot_Base_Path_Name = "Screenshots/"; // this is the base path which will use the USB_Mount_Point to store the screenshots.
 
     // Settings
 #ifdef BUILD_FOR_TARGET
@@ -77,10 +73,10 @@
 
 
     // FIXME : Not sure having global settings object is a good idea.
-#ifdef BUILD_FOR_DESKTOP
-    QSettings WifiSettings("/home/denali/wifi.ini");
-#elif BUILD_FOR_TARGET
+#ifdef BUILD_FOR_TARGET
     QSettings WifiSettings("/home/root/wifi.ini", QSettings::IniFormat);
+#else
+    QSettings WifiSettings("/home/denali/wifi.ini");
 #endif
 
     // TODO : These need to be removed from here because they are only used in their specific classes.