ArrayOf* types ganeration as separate classes
Revert "ArrayOf* types ganeration as separate classes"

This reverts commit 1fa32aad39a489a6d70ee64ea59136349f46ee91.