Add support for models in subfolders in generator