restructure for buildout