restructured data flow interfaces
merged remote into master