Add moto service

Conflicts:
	default.xml