Moves parsing to separate files, and cleans up files.