Repackaging and cleaning, changing everything to MultiBox