Moved client model back from shared

Moved pyplib into python subdirectory

Modified files to account for both changes