moved to ryoc (classBuilder)

named closues
code tidy