Moved things around to make configuration easier.