removed struct ClassMethod and ClassField
merged