Tidy up.
Merged include and source file directories.