Reorganized the include directory.
Addition of a common header.
Separated out headers.