Update copyright
Rearrange modules