Packages refactored. Added ServiceContainer