Updated classes with new service definitions

Delete dump from builder
Work on JSON type services. Implement callers and parsers.

Builder updated to
1 - not cause syntax errors leaving maps in a class without closing bracket
2 - inject service prefix into classes