Rearrange imports
Bump version to 0.5.0