XD-924: Split .x package into 3 additional projects