Fix bundle layering to not crash on differing structures, also skip hidden files