Removed imports from same package and sorted imports