Moving items; removed Epiphany and State Machine