New Geometrical Modelling for 2D Fabric and 2.5D Interlock Composites