Changes classes include directory name, corrects a few mistakes