Big push, refactoring container to plugins