Renamed two files from "factory" to "service"