Rearrange base Dockerfile and add some metadata