Removed old header files, created new ones, sorted data into appropriate headers