Fixed imports and package names
Fixed some comments