Bug fix to weave command line parameters - -t and -i cause issues!
Some refactoring to structure docker images.