GBM Long and Short GRB Lightcurve Decomposition Analysis