re-organized: headers->header-directory, cpp->cpp-directory and headers finished