move stuff from junk namespace to main