Changed data folder structure
Merge branch 'dev_network' of https://github.com/totteCh/B17 into dev_network