fix file organization