some more modules added, wmaker modules restructured