Big Reformat/Organization/Cleanup
Merge pull request #79 from stuntguy3000/patch01

Big Reformat/Organization/Cleanup