Merge "Move DataSourceUnwrapper and MemorySource to ID3 class"