Much more correct check in of the bundle directory

Might move to submodules soon for all these