Move all the header files to their own directory to make things cleaner, apply fixes to all the headers for this change.