renaming the package
fixing some imports