Restructuring in preparation for binary releases