Move containers from the Common component to a sub directory.