chunks.go -> chunk.go

Change-Id: I01786dc6e2cf9b10fc5ffae82f48dfda5caca7c5
Cleanups.

Change-Id: Id0406ddbd21aaf935ddb510c92dc752e9ee1905b