Changed object class directory structure