Restructured imports