Separated classes into separate .scala files, and limited lines to 80
characters each.