add comment and rearrange files dependency.