re ordering folders + UML descr

using StarUml