Required changes for restructured core packages