Move to the new package structure.