Changed order of package loading.