Change object hierarchy and naming scheme