rearranged make files