Moved Server class to core package