improved file organization