Moved 'server' packages to 'common'