Removed InjectionCallback from methods that should not need them.
Reorganized the modules.