Reorganize Dockerfile