move Classes for Json Mapping