Restructure
Restructure
Restructure part 2
Restructure part 2
Restructure part 2
Restructure part 3
Code cleanup
Merge pull request #33 from TommyIsGod/master

Code cleanup