Reorganized package.
Changed formatting.