Create separate service files. Updated demo.