Merge "Moved and renamed effect API header files"