xml fixed after package restructure