Reorganized iomama package