Refactor services declaration in xml

Issue #11