Rearrange files and make some layout adjustments