[issue #7] Moved and renamed service definition and reference classes.