Bundle setup

@etorres @eliast