#4137 Consolidating projects/dlls
#4137 Consolidating projects/dlls
#4137 continue consolidation