CompletionModel: better sectionning of the code

Some sections became very small, so they are now included in other, more
general, sections.
Completion: split the code into sections (not finished)