Moved the header files around a bit