Added more OOP to HttpApi; Prepared for #1