New Server files to fix building issues.