+ lots of cleanup, reorganizing
reorganize packages to match Fabric version use util classes from Fabric version