Now we have the final repo layout structure
Merge pull request #4 from chiteri/master

Better repo layout, fixed bug in functions for reading data