Map imports correctly for package structure