Changed names and contents of Spring config to match new package names, removed Spring config no longer appropriate for the kernel