Use etag to generate ETag header
Remove utils to simplify file layout