ReFactor Site into Site and API