move some widget headers in subdir
and fix some stuff