Move Functor typedef To Header File
Rename Method Files