More Organizing
Merge pull request #5 from swndr/master

More Organizing