Rearrange files to make module more intuitive.