Restructured the package.

Simple restructuring.