Removing usused imports
Renaming package