Add MAINTAINER to Dockerfile and rearrange a bit