Move service to its own folder

Add service folder