Importing the actual classes where needed would keep the number of changes low. We don't import packages anywhere else and I see no particular reason for having to prefix the classes with the package everywhere.