Added dojo and moved servers around