Correct imports to work properly with private files