Dependency injector ptr

Architecture is modified, all old *ptr has been removed.