reorganisations of some files in src/include directory, and check-in also fixes the "make dist"