Refactored and renamed classes