Merge pull request #1 from wklaebe/master

updates, enhancements
Reduce directory depth.
fix announce.sh