Refactoring and remove_server implemented

Conflicts:
	distributed_calc.py