Service Stub + upto Components/logging are cleared.
dependency refactoring completed