Code reorg to add entities folder and move graph folder up