Move creation of "filelocator" service to FileLocatorFactory