diff --git a/src/storage.py b/src/storage.py
index 7ff7350..ec248bf 100644
--- a/src/storage.py
+++ b/src/storage.py
@@ -10,9 +10,9 @@ app_type = ""
 def setup():
 	global data_directory, app_type
 	if len(glob.glob("Uninstall.exe")) > 0: # installed copy
-		if os.path.exists(paths.app_data_path("musicDL")) == False:
-			paths.prepare_app_data_path("musicDL")
-		data_directory = paths.app_data_path("musicDL")
+		if os.path.exists(paths.data_path("musicDL")) == False:
+			os.mkdir(paths.data_path("musicDL"))
+		data_directory = paths.data_path("musicDL")
 		app_type = "installed"
 	else:
 		app_type = "portable"
diff --git a/src/test/test_storage.py b/src/test/test_storage.py
index 1ae32d4..b87e93a 100644
--- a/src/test/test_storage.py
+++ b/src/test/test_storage.py
@@ -27,13 +27,13 @@ class storageTestCase(unittest.TestCase):
 		storage.setup()
 		self.assertEquals(storage.app_type, "installed")
 		self.assertTrue(os.path.exists(storage.data_directory))
-		self.assertEquals(storage.data_directory, paths.app_data_path("musicDL"))
+		self.assertEquals(storage.data_directory, paths.data_path("musicDL"))
 
 	def tearDown(self):
 		""" Removes uninstall.exe created for tests and data path."""
 		fix_winpaths.fix()
-		if os.path.exists(paths.app_data_path("musicDL")):
-			shutil.rmtree(paths.app_data_path("musicDL"))
+		if os.path.exists(paths.data_path("musicDL")):
+			shutil.rmtree(paths.data_path("musicDL"))
 		if os.path.exists(os.path.join(paths.app_path(), "uninstall.exe")):
 			os.remove(os.path.join(paths.app_path(), "uninstall.exe"))