Renamed wrong-named classes
Changed all-static classes from abstratc to final