Rearrange and rename package.
Final fixes