Moar client directory

Missed in the original commit.... again.
Persistence Directory changes.
Server directory commit.