[MFB] Enough support for KLT. Cleaned the directories.