rename original dir to new
Merge pull request #2 from tobie/branch-2

rename original dir to new