Fix modules directory location, update usbutils (github vs project repo) and fix...