rearranged Dockerfile