MOD: Reorganized code so it is more structured.
Merge branch 'master' of github.com:izzycecil/Paratype