Slight file rearrangement

for consistancy