re-orgin the stuff