ecosystem restructure w/ minor tuning