Formatting of new code
Moved and renamed http mockery code
Moved Http mockery tests