Rearrange package to allow for installability.