Indented the files
Moved class functions to cpp