Swim -> swimx content migration, part 2