move classes for Json Mapping