Add initial bundle structure, closes #1