preparing for incremental bitstreams import

* adapting for new fs layout
* output a bit more info in --debug mode