Finish cuda core part refactoring

Here too.