Moved more code into own files.