more reorg of completions stuff
rename package