Moving toward more obj-oriented, modular hierarchy