builddir in models; generate with builddir and new structure