improving 'gen' code for models, renaming client(x) to just (x) for folders