Refactor as fabric from class2go_fabric

Flatten and rename