Place all the remaining static inline function in a separate header Move all headers in an include folder