Change up bundle file structure a bit