Move some methods around

put methods from the HTTP module in the class they are being used