Put all headers in one file
Removed unnecessary header files