Updated and made it more organized
Merge pull request #5 from TheDrunkMafia/patch-2

Updated and made it more organized