revised directory tree to be more bundle-like