Make site files more generic, eliminate ABWA references