Move methods to one file; they must refactor!