Removed site, reorganized tree