ISAACLOUD-1322 code reorganize, add schema validator