issue# 19549: Move widgets and views up a directory.
Merge pull request #10 from jrogelstad/master

19549: Merge to master.