Refactor: decouple internal struct from the HTTP json response and CLI

Currently, the internal structs are coupled with the HTTP handler. 
The json response is directly taken from the internal struct via the JSON tags

We would like to decouple them.