Fix package name. Clean up imports and old comments.