ReFactor Site into Site and API
Merge pull request #127 from addshore/apiclass

ReFactor Site into Site and API