Organized some of the code.
Merge origin/master