reorganize to avoid building so many buildout parts