Some reorganzing done