files rearranged in a more organized way