refactor source to split modules
Merge branch 'master' of github.com:wb14123/bard