organizations refactored
implementing lazy_load
using NonLoaded class instead of nil
make catalogs lazy_load