Simplify site organization