Changed naming convention for functions and methods.
Moved implementation from header files to .cpp files