Moved Blocks class into own file, added getter and setter.