Incremental commit of services refactor