Move Dockerfile into builder directory
Rename builder to image