Renames (to the new directory structure) and fixes test cases
Renames into the new directory structure
Renames into the new directory structure
Bumps RC7
Fixes typo