Moved args.go out of the main directory.
Cleaned up to use the new data structures.