diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index 6cb988e622..659c3094e6 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -25,12 +25,9 @@ Screens = \
 Screen.cpp Screen.h ScreenAttract.cpp ScreenAttract.h \
 ScreenBookkeeping.cpp ScreenBookkeeping.h \
 ScreenCenterImage.cpp ScreenCenterImage.h ScreenCredits.cpp ScreenCredits.h \
-ScreenCourseManager.cpp ScreenCourseManager.h \
 ScreenDebugOverlay.cpp ScreenDebugOverlay.h \
 ScreenDemonstration.cpp ScreenDemonstration.h ScreenDimensions.h \
 ScreenEdit.cpp ScreenEdit.h \
-ScreenEditCourse.cpp ScreenEditCourse.h \
-ScreenEditCourseEntry.cpp ScreenEditCourseEntry.h \
 ScreenEditMenu.cpp ScreenEditMenu.h ScreenEnding.cpp ScreenEnding.h \
 ScreenEvaluation.cpp ScreenEvaluation.h ScreenExit.cpp ScreenExit.h ScreenNetEvaluation.cpp ScreenNetEvaluation.h \
 ScreenNetSelectMusic.cpp ScreenNetSelectMusic.h ScreenNetSelectBase.cpp ScreenNetSelectBase.h ScreenNetRoom.cpp ScreenNetRoom.h \
@@ -42,7 +39,10 @@ ScreenMapControllers.cpp ScreenMapControllers.h \
 ScreenMessage.cpp ScreenMessage.h ScreenMiniMenu.cpp ScreenMiniMenu.h ScreenMusicScroll.cpp ScreenMusicScroll.h \
 ScreenNameEntry.cpp ScreenNameEntry.h ScreenNameEntryTraditional.cpp ScreenNameEntryTraditional.h \
 ScreenOptions.cpp ScreenOptions.h \
+ScreenOptionsEditCourse.cpp ScreenOptionsEditCourse.h \
+ScreenOptionsEditCourseEntry.cpp ScreenOptionsEditCourseEntry.h \
 ScreenOptionsEditProfile.cpp ScreenOptionsEditProfile.h \
+ScreenOptionsManageCourses.cpp ScreenOptionsManageCourses.h \
 ScreenOptionsMaster.cpp ScreenOptionsMaster.h \
 ScreenOptionsMasterPrefs.cpp ScreenOptionsMasterPrefs.h ScreenPackages.cpp ScreenPackages.h \
 ScreenPlayerOptions.cpp ScreenPlayerOptions.h \
diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index c0c9480ae7..fff30d6baf 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -276,12 +276,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="ScreenCenterImage.h">
 			</File>
-			<File
-				RelativePath=".\ScreenCourseManager.cpp">
-			</File>
-			<File
-				RelativePath=".\ScreenCourseManager.h">
-			</File>
 			<File
 				RelativePath="ScreenCredits.cpp">
 			</File>
@@ -309,18 +303,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScreenEdit.h">
 			</File>
-			<File
-				RelativePath=".\ScreenEditCourse.cpp">
-			</File>
-			<File
-				RelativePath=".\ScreenEditCourse.h">
-			</File>
-			<File
-				RelativePath=".\ScreenEditCourseEntry.cpp">
-			</File>
-			<File
-				RelativePath=".\ScreenEditCourseEntry.h">
-			</File>
 			<File
 				RelativePath="ScreenEditMenu.cpp">
 			</File>
@@ -459,6 +441,24 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScreenOptions.h">
 			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditCourse.cpp">
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditCourse.h">
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditCourseEntry.cpp">
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsEditCourseEntry.h">
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsManageCourses.cpp">
+			</File>
+			<File
+				RelativePath=".\ScreenOptionsManageCourses.h">
+			</File>
 			<File
 				RelativePath="ScreenOptionsMaster.cpp">
 			</File>
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index a6a7c7fd18..c35516c3a8 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -256,12 +256,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScreenCenterImage.h">
 			</File>
-			<File
-				RelativePath="ScreenCourseManager.cpp">
-			</File>
-			<File
-				RelativePath="ScreenCourseManager.h">
-			</File>
 			<File
 				RelativePath="ScreenCredits.cpp">
 			</File>
@@ -289,18 +283,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScreenEdit.h">
 			</File>
-			<File
-				RelativePath="ScreenEditCourse.cpp">
-			</File>
-			<File
-				RelativePath="ScreenEditCourse.h">
-			</File>
-			<File
-				RelativePath="ScreenEditCourseEntry.cpp">
-			</File>
-			<File
-				RelativePath="ScreenEditCourseEntry.h">
-			</File>
 			<File
 				RelativePath="ScreenEditMenu.cpp">
 			</File>
@@ -439,12 +421,30 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
 			<File
 				RelativePath="ScreenOptions.h">
 			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourse.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourse.h">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourseEntry.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsEditCourseEntry.h">
+			</File>
 			<File
 				RelativePath="ScreenOptionsEditProfile.cpp">
 			</File>
 			<File
 				RelativePath="ScreenOptionsEditProfile.h">
 			</File>
+			<File
+				RelativePath="ScreenOptionsManageCourses.cpp">
+			</File>
+			<File
+				RelativePath="ScreenOptionsManageCourses.h">
+			</File>
 			<File
 				RelativePath="ScreenOptionsMaster.cpp">
 			</File>