Consolidated server code under core/