Refactoring data organization
Updating README with Install instructions
Merge pull request #1 from brettpthomas/master

Random updates