Tidy up some more triggers
Split build tools into own package.