Actually create proper header files
More changes of things