Moved stuff around to work better (by that I mean work at all) in Apache