Move sites related stuff a bit