Additional functions and rearranging of package contents.
Additional functions and rearranging of package contents.