Smith and Vilma Restructure (Mega Server Overload Merge)

Smart move by all involved.