Refactoring some class names/packages