Reorganized some headers and added a new enum