Separate MFilesAPI from Service Entities