multi-tenant & yaml configuration revise

#210