Updated Dockerfile

Moved to a layout that is more Docker build cache friendly