CE-1019 Refactoring hooks definition to avoid static invoking
CE-1019 Minor cleanup - File rename and remove