Move server to seperate file
Fix for latest nightly