refactoring of the resources and containers