A few single-wrord question fixes
Reorg the docker files
tweak makefile for new directory