Reorganization
Everything

The file now seems to be synced up to this.
Merge branch 'master' of https://github.com/LEhlers/Raindrops