Re-organizing CarbonFibers

Change-Id: I9d64177e856d7890952cf96f0afeae6933a74e8f