Re-organize structure