structural changes, package additions
Merge branch 'src' of github.com:xiwcx/xiwcx.github.io into src