Update data
New naming
Do proper recip edges
Update layered flow
Update naming conventions