Restructure that Dockerfile