Re-order Dockerfile