Move DI classes under the load/ package, since this is where they belong
Rename one package