Rearrange directories for packaging