Restructured module imports