Templates are in
Rename site file
Move serialization into datastore class