Moved the bundle class, and added it to the toolbox