Shuffling things around

Moved a bunch of stuff to the HTTP module