Separated the clients and storage server drivers to different classes.
Apparently we can't have more than one server or client instance in one
run.
Merge branch 'multiple_servers_mico' into multiple_servers