HTTP classes reorganised