Working on package layout for remote imports