Totally Re-organized code.

Total Cleanup.  Much easier to get started in this format.  Updated
Google maps as well.