Did some more organizing and refactoring
Merge remote-tracking branch 'origin/master'