Move include files to subdirectory.
Rename includes.
Fix include directives.