Reorganized packages references to match the new project organization