Fix imports
Move client, server and common back into the same library. We're too old for over-designing.