+bunch of renames to bring the 2 version closer
reorganize packages to match Fabric version use util classes from Fabric version