source code re-org, move taxonomy to separate include