Continue refactoring. 

Add site model and mapper. Moved a few more methods out of database class.

Works on #22