Rearrange imports and create installable package