diff --git a/stepmania/src/Bookkeeper.cpp b/stepmania/src/Bookkeeper.cpp
index 296b4edd45..e38b435b14 100644
--- a/stepmania/src/Bookkeeper.cpp
+++ b/stepmania/src/Bookkeeper.cpp
@@ -13,7 +13,7 @@
 
 Bookkeeper*	BOOKKEEPER = NULL;	// global and accessable from anywhere in our program
 
-static const CString COINS_DAT = "Data/Coins.xml";
+static const CString COINS_DAT = "Save/Coins.xml";
 
 Bookkeeper::Bookkeeper()
 {
diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp
index b88a7c8624..19cbc2d50b 100644
--- a/stepmania/src/CatalogXml.cpp
+++ b/stepmania/src/CatalogXml.cpp
@@ -33,7 +33,7 @@
 
 const CString CATALOG_XML       = "Catalog.xml";
 const CString CATALOG_XSL       = "Catalog.xsl";
-const CString CATALOG_XML_FILE  = DATA_DIR + "Catalog.xml";
+const CString CATALOG_XML_FILE  = "Save/" + CATALOG_XML;
 
 void SaveCatalogXml( LoadingWindow *loading_window )
 {
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 97859ef89b..b03b60012a 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -285,8 +285,6 @@ const int NUM_ATTACKS_PER_LEVEL	= 3;
 const int ITEM_NONE = -1;
 
 
-#define DATA_DIR			CString("Data/")
-
 
 //
 // Coin stuff
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 401d00d02d..20f21006e8 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -14,7 +14,7 @@
 
 InputMapper*	INPUTMAPPER = NULL;	// global and accessable from anywhere in our program
 
-#define KEYMAPS_PATH "Data/Keymaps.ini"
+#define KEYMAPS_PATH "Save/Keymaps.ini"
 
 InputMapper::InputMapper()
 {
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index b9ce49f033..12684b5eae 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -12,7 +12,7 @@
 #include "RageLog.h"
 
 const CString DEFAULTS_INI_PATH		= "Data/Defaults.ini";		// these can be overridden
-const CString STEPMANIA_INI_PATH	= "Data/" PRODUCT_NAME ".ini";	// overlay on Defaults.ini, contains the user's choices
+const CString STEPMANIA_INI_PATH	= "Save/" PRODUCT_NAME ".ini";	// overlay on Defaults.ini, contains the user's choices
 const CString STATIC_INI_PATH		= "Data/Static.ini";		// overlay on the 2 above, can't be overridden
 
 PrefsManager*	PREFSMAN = NULL;	// global and accessable from anywhere in our program
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index 733805e56d..62ca6488cc 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -37,8 +37,8 @@ static void DefaultLocalProfileIDInit( size_t /*PlayerNumber*/ i, CString &sName
 Preference1D<CString> ProfileManager::m_sDefaultLocalProfileID( DefaultLocalProfileIDInit, NUM_PLAYERS );
 
 #define NEW_MEM_CARD_NAME		""
-#define USER_PROFILES_DIR		"/Data/LocalProfiles/"
-#define MACHINE_PROFILE_DIR		"/Data/MachineProfile/"
+#define USER_PROFILES_DIR		"/Save/LocalProfiles/"
+#define MACHINE_PROFILE_DIR		"/Save/MachineProfile/"
 const CString LAST_GOOD_SUBDIR	=	"LastGood/";
 
 
diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp
index 068fe2f776..d9c1e5d29b 100644
--- a/stepmania/src/RageFileManager.cpp
+++ b/stepmania/src/RageFileManager.cpp
@@ -258,7 +258,7 @@ void RageFileManager::MountInitialFilesystems()
 	
 	/* We can almost do this, to have machine profiles be system-global to eg. share
 	 * scores.  It would need to handle permissions properly. */
-/*	RageFileManager::Mount( "dir", "/var/lib/games/stepmania", "/Data/Profiles" ); */
+/*	RageFileManager::Mount( "dir", "/var/lib/games/stepmania", "/Save/Profiles" ); */
 	
 	// CString Home = getenv( "HOME" ) + "/" + PRODUCT_NAME;
 
@@ -738,7 +738,7 @@ static bool PathUsesSlowFlush( const CString &sPath )
 {
 	static const char *FlushPaths[] =
 	{
-		"Data/"
+		"Save/"
 	};
 
 	for( unsigned i = 0; i < ARRAYSIZE(FlushPaths); ++i )
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 0013d904a0..cf6981813e 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -739,7 +739,7 @@ RageDisplay *CreateDisplay()
 	RageException::Throw( error );
 }
 
-#define STATIC_INI_PATH "Data/Static.ini"
+extern const CString STATIC_INI_PATH;
 
 void ChangeCurrentGame( const Game* g )
 {