Added datastore; moved header and footer into separate files