Restructure client model loading mechanism

A couple of cyclical depencies occured, which are now sort of resolved.
However, a thorough review of the current system seems adequate at some point.