Changed package Name

Renamed the package and removed some unused imports