Rename packages and rearrange the structure