Update uri config
Move uri space configuration to code base
refactored thread start to separate methods
Merge branch 'master' into listeners
Split diskstorage into separate files