Modified the structure of service project