Adjusted the main architecture to conform to the way we've been doing things.