Fixing package and imports