Conversation and discourse analysis

hi there,

i am trying to get some linguistic terms in order - but realized that some things i just don't understand... hope, you can help me.

my assumptions so far is: both, conversation (CA) and discourse analysis (DA) are part of pragmatics. hence, semantics is not to be considered here. i then tried to collect the main findings of pragmatics and to differentiate them according to their belonging to CA or DA:

Pragmatics: CA & DA

CA: turn-taking, adjacency pairs, repair, backchannels

DA: speechact theory, Grice's maxims, implicature, politeness and presupposition

what do you think? could one see it this way? or do you have other suggestions? thanx for your help!