Move container iterate into a deprecated lib.
Move more stuff out of the base directory.