Deleted modules/contrib/ftools and modules/contrib/scanner. Edited many module .info files with better package names.