Further refactoring of funcs into multiple headers