Old system files code updated to point to packages