restructured docker hierarchy