Move the dylib bundling code into a separate class
This means two less arguments to every function call