Moved completion classes to sub-package