taoup: Re-organize structure