Moved class into separate file.