More progress on OpenCL Refactoring