refactored data module into topology
Merge remote-tracking branch 'origin/develop' into develop

s necessary,