Reorder containers. Fixes #300