Restructuring code to be more modular
Merge pull request #1 from KingOfPoptart/master

Restructuring code to be more modular