minor reorganization...
should be mostly working now...
and confirmed that dockerized deploy works too...