Merge "Re-worked header files"