some more re-org and renaming, added unifiedpreference and other jars