Added NatGeo example test case.
Reorganize folders and some improvements to the code.
Merge pull request #3 from emacampolo/cristian_new

Added NatGeo example test case. Fixed code style.