Prepare buildout to be more easily reusable