Refactor XProject packages