Moved core server out into module