Added clang. Cleaned up directories