Class diagram and rearrange files