Rename folders (FIX #456)
Merge pull request #472 from sub/issue456

Rename folders (FIX #456)