#50 Separated sources to begin on server