Move classes hierarchy back to natural size. Also added new version of response importer after refactoring