Revert "Catalog tree refactoring"

This reverts commit 123e1cb56456583f596e8083ca916911432b539f.
Catalog tree refactoring
Merge pull request #400 from geoadmin/dev_catalogtree_refactoring_take2

Dev catalogtree refactoring take2