Re-organize the MTT Server side of the house in preparation for a new arch.