restructure for two containers, and start of standalone script to parse yaml