Merge pull request #1 from powellb1/master

New file organization.
Merge pull request #9 from rompab/master

Update Fork