Rename and re-organize some classes and packages
Renaming and re-organizing test classes