Reorganized package and bumped revision in version.