Reorganized the packaging to the correct structure.