Use directory instead of folder naming convention
Update CHANGES for directory name convention