Instead of removing Animation Courtyard completely, Launch Bay would be removed and act as the entrance to the new land located behind Launch Bay (where the offices are now).
Little Mermaid is going anywhere for a while as they've invested in a new show (We had new concept art for the costumes released at D23 so it hasn't actually gone quiet), but they could always reroute the exit as you enter on what was Mickey Avenue.
Disney Junior contains the park's Club 33, so that building will remain in tact. They can either keep Disney Junior downstairs or convert it back to a dining establishment like it was when the park opened