Changed package decleration and removed unused imports.