Refactored and renamed classes commit.