re-org, remove fabric
fix yaml requirement