Fix imports and package names