Restructured package layouts. Modified schemaloc remapping to update namespace portion of xsi:schemaLocation string