Organized Stuff
Merge pull request #1 from Vandenn/master

Organized Stuff