First commits of new data structure
Git repo changes
More changes to data structure and start reconstructing data from email click.
merging oickle branch