file organization cleanup