Fix naming of packages
Normalize 'import' style