Updated package layout.
Merge branch 'static-display-update' of https://github.com/LGordon2/word-servant.git into static-display-update