Clean up the buildscript:
- make the directories easier to configure
- Hack around the fact that we need to install -Dextras before make test