rhbz1139950 - refactor (rename and move classes)