Rearrange some files in the project