improved docker hierarchy