refactoring, moving staff to maven modules
reading from stream fixed to work against clustered space