Remove CLI from the repository.
Update to using the new lib directories.
Modify the modules file and always do manual device scanning.