Index: vhosts/conf.d/course-search.conf
===================================================================
--- vhosts/conf.d/course-search.conf	(revision 542)
+++ vhosts/conf.d/course-search.conf	(revision 543)
@@ -1,7 +1,5 @@
-# do not trailing-slash DocumentRoot
-
 <VirtualHost *:80>
-	ServerName mitdlbc.mit.edu
-	ServerAlias mitdlbc
+	ServerName course.mit.edu
+	ServerAlias course
 	DocumentRoot /afs/sipb.mit.edu/project/course-search/web_scripts/course
 	Alias /~course-search /afs/sipb.mit.edu/project/course-search/web_scripts
@@ -12,6 +10,6 @@
 <IfModule ssl_module>
 	<VirtualHost *:443 *:444>
-		ServerName course-search.mit.edu
-		ServerAlias course-search
+		ServerName course.mit.edu
+		ServerAlias course
 		DocumentRoot /afs/sipb.mit.edu/project/course-search/web_scripts/course
 		Alias /~course-search /afs/sipb.mit.edu/project/course-search/web_scripts
@@ -20,2 +18,22 @@
 	</VirtualHost>
 </IfModule>
+
+<VirtualHost *:80>
+	ServerName co.mit.edu
+	ServerAlias co
+	DocumentRoot /afs/sipb.mit.edu/project/course-search/web_scripts/co
+	Alias /~course-search /afs/sipb.mit.edu/project/course-search/web_scripts
+	SuExecUserGroup course-search course-search
+	Include conf.d/vhosts-common.conf
+</VirtualHost>
+
+<IfModule ssl_module>
+	<VirtualHost *:443 *:444>
+		ServerName co.mit.edu
+		ServerAlias co
+		DocumentRoot /afs/sipb.mit.edu/project/course-search/web_scripts/co
+		Alias /~course-search /afs/sipb.mit.edu/project/course-search/web_scripts
+		SuExecUserGroup course-search course-search
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>
Index: vhosts/conf.d/mathmike.conf
===================================================================
--- vhosts/conf.d/mathmike.conf	(revision 542)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<VirtualHost *:80>
-	ServerName course.mit.edu
-	ServerAlias course
-	DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/course
-	Alias /~mathmike /afs/athena.mit.edu/user/m/a/mathmike/web_scripts
-	SuExecUserGroup mathmike mathmike
-	Include conf.d/vhosts-common.conf
-</VirtualHost>
-
-<IfModule ssl_module>
-	<VirtualHost *:443 *:444>
-		ServerName course.mit.edu
-		ServerAlias course
-		DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/course
-		Alias /~mathmike /afs/athena.mit.edu/user/m/a/mathmike/web_scripts
-		SuExecUserGroup mathmike mathmike
-		Include conf.d/vhosts-common-ssl.conf
-	</VirtualHost>
-</IfModule>
-
-<VirtualHost *:80>
-	ServerName co.mit.edu
-	ServerAlias co
-	DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/co
-	Alias /~mathmike /afs/athena.mit.edu/user/m/a/mathmike/web_scripts
-	SuExecUserGroup mathmike mathmike
-	Include conf.d/vhosts-common.conf
-</VirtualHost>
-
-<IfModule ssl_module>
-	<VirtualHost *:443 *:444>
-		ServerName co.mit.edu
-		ServerAlias co
-		DocumentRoot /afs/athena.mit.edu/user/m/a/mathmike/web_scripts/co
-		Alias /~mathmike /afs/athena.mit.edu/user/m/a/mathmike/web_scripts
-		SuExecUserGroup mathmike mathmike
-		Include conf.d/vhosts-common-ssl.conf
-	</VirtualHost>
-</IfModule>
Index: vhosts/conf.d/mitdlbc.conf
===================================================================
--- vhosts/conf.d/mitdlbc.conf	(revision 543)
+++ vhosts/conf.d/mitdlbc.conf	(revision 543)
@@ -0,0 +1,21 @@
+# do not trailing-slash DocumentRoot
+
+<VirtualHost *:80>
+	ServerName mitdlbc.mit.edu
+	ServerAlias mitdlbc
+	DocumentRoot /afs/athena.mit.edu/activity/m/mitdlbc/web_scripts/mitdlbc
+	Alias /~mitdlbc /afs/athena.mit.edu/activity/m/mitdlbc/web_scripts
+	SuExecUserGroup mitdlbc mitdlbc
+	Include conf.d/vhosts-common.conf
+</VirtualHost>
+
+<IfModule ssl_module>
+	<VirtualHost *:443 *:444>
+		ServerName mitdlbc.mit.edu
+		ServerAlias mitdlbc
+		DocumentRoot /afs/athena.mit.edu/activity/m/mitdlbc/web_scripts/mitdlbc
+		Alias /~mitdlbc /afs/athena.mit.edu/activity/m/mitdlbc/web_scripts
+		SuExecUserGroup mitdlbc mitdlbc
+		Include conf.d/vhosts-common-ssl.conf
+	</VirtualHost>
+</IfModule>