major refactoring allow coexistence of MKL and non-MKL cases
rewrite MKL note in the positive
conditionally add MKL dirs
fix order