move sites to a more extendable implementation