Reorganized previously unincluded header files.
Reorganized files.