Merge pull request #5 from mmwanga/master

Pointing script to reorganized data folders
Now we have the final repo layout structure
Merge pull request #2 from chiteri/master

Better repo layout, fixed bug in functions for reading data