rename base object factory
Update names of base objects for clarity
update references to server object factory -> server
update references to server and client object factory
make initialize method use instance object directly instead of
getInstance which would force reload mid-getInstance()