clean up for new code structure
Merge branch 'master' of https://github.com/jackylee0424/shybot