Began normalizing the different Dockerfiles and shellscript names
fixed merge