Merge folder rename from cpan_mock_it branch