cleanup dir hierarchy
update dir hier; remove cruft (incl. sf builds)