refactor of io layer after major changes, removed benchmarks module
Merge branch 'master' into io-refactor