Hi Danny,
Excellent idea of making the JP's agnostic unless there is a need to make it specific to the org/site, but then again, you can do that on the task and resources anyway.
Moving the Work Group to the PM does make sense; however, please note ...