Big refactor of bundler interface to integrate everything in own code