reorganize version hierarchy