Created separate records package, replaced FolderClass with generated code
Code cleanup - removed unused classes, old FormFieldType.XXXX constants