Cosmetic fixes in package names, .gitignore ...