Clean up some of the Dockerfiles and directories, still testing everything out.