Migrating bits into separate packages for use in configurator
Finished up JSON Marshaler and Unmarshaler interface impl