Add Name structure.
Separate env in a new file.
Remove unnused file.
Add simple error handling to scanner.
Break scanner into files.