Changes to the wizard and builders

We wanted to handle the included libraies better.