Lazy-loading catalogue tree

1. the renaming will be done in the next commit.