moved into src
JSONModel included properly