Move stuff that belongs together in one file.
Extract method, for simpler code.