Starting splitting up into header files