Rename 'web' package back to 'server'