Moved server to child module