Add folders to all the models, fix path generation for underscored paths