core,server: Fix accidental file move