Update make.py wrt new containers structure.