Move methods to cpp files