re-arrange some of the widgets into subdirectories