update for new layout
reorg dependencies