better organization, smaller Dockerfile