Re-organization and update
Merge pull request #31 from RedComrade/master

All ambiences done