Rearrange files for ease of reading