Reorg tagweed code to make it more rational