Separate container and network to new classes.