Refactoring, cleanup and http addition
.
Removed old file