diff --git a/demGpCov2D.m b/gp/demGpCov2D.m
similarity index 99%
rename from demGpCov2D.m
rename to gp/demGpCov2D.m
index 8d70369f..c7750a07 100644
--- a/demGpCov2D.m
+++ b/gp/demGpCov2D.m
@@ -13,7 +13,7 @@ function demGpCov2D(ind,bw)
 % SEEALSO : demCovFuncSample, demGPSample
 % COPYRIGHT : Neil D. Lawrence, 2006, 2008
 
-% GPMAT
+% GP
 
 if nargin < 2
   bw = false;
@@ -122,4 +122,4 @@ function demGpCov2D(ind,bw)
 
 zeroAxes(gca, 0.025, 18, 'times')
 
-ax = gca;
\ No newline at end of file
+ax = gca;
diff --git a/demGpCovFuncSample.m b/gp/demGpCovFuncSample.m
similarity index 99%
rename from demGpCovFuncSample.m
rename to gp/demGpCovFuncSample.m
index 07edc593..aa0bb245 100644
--- a/demGpCovFuncSample.m
+++ b/gp/demGpCovFuncSample.m
@@ -9,7 +9,7 @@
 %
 % SEEALSO : kernCreate
   
-% GPMAT
+% GP
 
   global printDiagram
   randn('seed', 1e5)
@@ -120,4 +120,4 @@ function prepPlot(a)
   if printDiagram
     printPlot(['demGpCovFuncSample' num2str(fig)], '../tex/diagrams', '../html');
   end
-end
\ No newline at end of file
+end
diff --git a/demGpSample.m b/gp/demGpSample.m
similarity index 97%
rename from demGpSample.m
rename to gp/demGpSample.m
index 41ee9669..845ac82f 100644
--- a/demGpSample.m
+++ b/gp/demGpSample.m
@@ -1,6 +1,6 @@
 % DEMGPSAMPLE Simple demonstration of sampling from a covariance function.
 
-% GPMAT
+% GP
 
 randn('seed', 1e5)
 rand('seed', 1e5)
@@ -54,4 +54,4 @@
 %   print('-depsc', '../tex/diagrams/gpSample.eps');
 % end
 
-save demGpSample K x f
\ No newline at end of file
+save demGpSample K x f
diff --git a/demGpTwoSample.m b/gp/demGpTwoSample.m
similarity index 93%
rename from demGpTwoSample.m
rename to gp/demGpTwoSample.m
index 98b9eafa..3fbc24ed 100644
--- a/demGpTwoSample.m
+++ b/gp/demGpTwoSample.m
@@ -1,6 +1,6 @@
 % DEMGPTWOSAMPLE Test GP two sample code.
 
-% GPMAT
+% GP
 
 % Generate artificial data. 
 numSamps = 3;
@@ -18,4 +18,4 @@
 y{1} = yTrue(:, 1:5)';
 y{2} = yTrue(:, 6:10)';
 
-llr = gpTwoSample(t, y);
\ No newline at end of file
+llr = gpTwoSample(t, y);
diff --git a/demGpTwoSampleEB.m b/gp/demGpTwoSampleEB.m
similarity index 97%
rename from demGpTwoSampleEB.m
rename to gp/demGpTwoSampleEB.m
index a032077c..47575107 100644
--- a/demGpTwoSampleEB.m
+++ b/gp/demGpTwoSampleEB.m
@@ -1,6 +1,6 @@
 % DEMGPTWOSAMPLEEB Run GP two sample code on EB.
 
-% GPMAT
+% GP
 
 % Load data
 load EB
diff --git a/demGpTwoSampleLif.m b/gp/demGpTwoSampleLif.m
similarity index 89%
rename from demGpTwoSampleLif.m
rename to gp/demGpTwoSampleLif.m
index a60e6755..4fccf131 100644
--- a/demGpTwoSampleLif.m
+++ b/gp/demGpTwoSampleLif.m
@@ -1,6 +1,6 @@
 % DEMGPTWOSAMPLELIF Run GP two sample code on LIF.
 
-% GPMAT
+% GP
 
 % Load data
 load LIF
@@ -16,4 +16,4 @@
   fprintf([num2str(llr(i), 4) '\t' genes_vect{1, i} '\n'])
 end
 
-save LIFresults.mat llr models 
\ No newline at end of file
+save LIFresults.mat llr models 
diff --git a/demGpTwoSampleLifsh.m b/gp/demGpTwoSampleLifsh.m
similarity index 98%
rename from demGpTwoSampleLifsh.m
rename to gp/demGpTwoSampleLifsh.m
index fcff9e25..75dcc115 100644
--- a/demGpTwoSampleLifsh.m
+++ b/gp/demGpTwoSampleLifsh.m
@@ -1,6 +1,6 @@
 % DEMGPTWOSAMPLELIFSH Run GP two sample code on LifSh.
 
-% GPMAT
+% GP
 
 % Load data
 load shLIF
diff --git a/demInterpolationGp.m b/gp/demInterpolationGp.m
similarity index 99%
rename from demInterpolationGp.m
rename to gp/demInterpolationGp.m
index 4575f86b..6537072e 100644
--- a/demInterpolationGp.m
+++ b/gp/demInterpolationGp.m
@@ -6,7 +6,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2006, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e6)
 rand('seed', 1e6)
@@ -97,4 +97,4 @@
     end
     figNo = figNo + 1;
   end
-end
\ No newline at end of file
+end
diff --git a/demOptimiseGp.m b/gp/demOptimiseGp.m
similarity index 99%
rename from demOptimiseGp.m
rename to gp/demOptimiseGp.m
index da2f18ac..762b2ac3 100644
--- a/demOptimiseGp.m
+++ b/gp/demOptimiseGp.m
@@ -5,7 +5,7 @@
 
 % COPYRIGHT : Neil D. Lawrence, 2006, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e5);
 rand('seed', 1e5);
diff --git a/demOptimiseGpTutorial.m b/gp/demOptimiseGpTutorial.m
similarity index 99%
rename from demOptimiseGpTutorial.m
rename to gp/demOptimiseGpTutorial.m
index b5cdb500..e527697e 100644
--- a/demOptimiseGpTutorial.m
+++ b/gp/demOptimiseGpTutorial.m
@@ -5,7 +5,7 @@
 
 % COPYRIGHT : Neil D. Lawrence, 2006, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e5);
 rand('seed', 1e5);
diff --git a/demRegressionGp.m b/gp/demRegressionGp.m
similarity index 99%
rename from demRegressionGp.m
rename to gp/demRegressionGp.m
index fbd0250f..e7e5b84d 100644
--- a/demRegressionGp.m
+++ b/gp/demRegressionGp.m
@@ -6,7 +6,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2006
 
-% GPMAT
+% GP
 
 randn('seed', 1e7)
 rand('seed', 1e7)
@@ -115,4 +115,4 @@
     end
     figNo = figNo + 1;
   end
-end
\ No newline at end of file
+end
diff --git a/demRegressionSimple.m b/gp/demRegressionSimple.m
similarity index 100%
rename from demRegressionSimple.m
rename to gp/demRegressionSimple.m
diff --git a/demSilhouetteAverage.m b/gp/demSilhouetteAverage.m
similarity index 98%
rename from demSilhouetteAverage.m
rename to gp/demSilhouetteAverage.m
index 12127f94..1fbf30c7 100644
--- a/demSilhouetteAverage.m
+++ b/gp/demSilhouetteAverage.m
@@ -7,7 +7,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e7)
 rand('seed', 1e7)
diff --git a/demSilhouetteGp1.m b/gp/demSilhouetteGp1.m
similarity index 99%
rename from demSilhouetteGp1.m
rename to gp/demSilhouetteGp1.m
index 51cb0d27..34258a7c 100644
--- a/demSilhouetteGp1.m
+++ b/gp/demSilhouetteGp1.m
@@ -7,7 +7,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e7)
 rand('seed', 1e7)
diff --git a/demSilhouetteGp2.m b/gp/demSilhouetteGp2.m
similarity index 99%
rename from demSilhouetteGp2.m
rename to gp/demSilhouetteGp2.m
index ae7e0e95..29db01fa 100644
--- a/demSilhouetteGp2.m
+++ b/gp/demSilhouetteGp2.m
@@ -7,7 +7,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e7)
 rand('seed', 1e7)
diff --git a/demSilhouetteLinear1.m b/gp/demSilhouetteLinear1.m
similarity index 96%
rename from demSilhouetteLinear1.m
rename to gp/demSilhouetteLinear1.m
index 997f6b67..7406b4a1 100644
--- a/demSilhouetteLinear1.m
+++ b/gp/demSilhouetteLinear1.m
@@ -7,7 +7,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e7)
 rand('seed', 1e7)
@@ -37,4 +37,4 @@
 save([fileBaseName '.mat'], 'model');
 
 
-demSilhouettePlot
\ No newline at end of file
+demSilhouettePlot
diff --git a/demSilhouettePlot.m b/gp/demSilhouettePlot.m
similarity index 98%
rename from demSilhouettePlot.m
rename to gp/demSilhouettePlot.m
index f534259f..e531f244 100644
--- a/demSilhouettePlot.m
+++ b/gp/demSilhouettePlot.m
@@ -1,6 +1,6 @@
 % DEMSILHOUETTEPLOT
 
-% GPMAT
+% GP
 
 % Show prediction for test data.
 yPred = modelOut(model, XTest);
diff --git a/demSilhouettePlotTrue.m b/gp/demSilhouettePlotTrue.m
similarity index 98%
rename from demSilhouettePlotTrue.m
rename to gp/demSilhouettePlotTrue.m
index a0b0f6bb..70996c95 100644
--- a/demSilhouettePlotTrue.m
+++ b/gp/demSilhouettePlotTrue.m
@@ -1,6 +1,6 @@
 % DEMSILHOUETTEPLOTTRUE Plot the true poses for the silhouette data.
 
-% GPMAT
+% GP
 dataSetName = 'silhouette';
 
 % load data
diff --git a/demSpgp1dGp1.m b/gp/demSpgp1dGp1.m
similarity index 98%
rename from demSpgp1dGp1.m
rename to gp/demSpgp1dGp1.m
index beb1aa32..bce4386d 100644
--- a/demSpgp1dGp1.m
+++ b/gp/demSpgp1dGp1.m
@@ -1,6 +1,6 @@
 % DEMSPGP1DGP1 Do a simple 1-D regression after Snelson & Ghahramani's example.
 
-% GPMAT
+% GP
 
 % Fix seeds
 randn('seed', 1e5);
diff --git a/demSpgp1dGp2.m b/gp/demSpgp1dGp2.m
similarity index 99%
rename from demSpgp1dGp2.m
rename to gp/demSpgp1dGp2.m
index f2c485f2..1d54339c 100644
--- a/demSpgp1dGp2.m
+++ b/gp/demSpgp1dGp2.m
@@ -1,6 +1,6 @@
 % DEMSPGP1DGP2 Do a simple 1-D regression after Snelson & Ghahramani's example.
 
-% GPMAT
+% GP
 
 % Fix seeds
 randn('seed', 2e5);
diff --git a/demSpgp1dGp3.m b/gp/demSpgp1dGp3.m
similarity index 97%
rename from demSpgp1dGp3.m
rename to gp/demSpgp1dGp3.m
index c4d759ad..44f28c36 100644
--- a/demSpgp1dGp3.m
+++ b/gp/demSpgp1dGp3.m
@@ -1,6 +1,6 @@
 % DEMSPGP1DGP3 Do a simple 1-D regression after Snelson & Ghahramani's example.
 
-% GPMAT
+% GP
 
 % Fix seeds
 randn('seed', 1e5);
@@ -35,4 +35,4 @@
 % Save the results.
 fileName = modelWriteResult(model, dataSetName, experimentNo);
 
-demSpgp1dPlot;
\ No newline at end of file
+demSpgp1dPlot;
diff --git a/demSpgp1dGp4.m b/gp/demSpgp1dGp4.m
similarity index 97%
rename from demSpgp1dGp4.m
rename to gp/demSpgp1dGp4.m
index 707c9be3..445b0a00 100644
--- a/demSpgp1dGp4.m
+++ b/gp/demSpgp1dGp4.m
@@ -1,6 +1,6 @@
 % DEMSPGP1DGP4 Do a simple 1-D regression after Snelson & Ghahramani's example.
 
-% GPMAT
+% GP
 
 % Fix seeds
 randn('seed', 1e5);
@@ -33,4 +33,4 @@
 % Save results
 fileName = modelWriteResult(model, dataSetName, experimentNo);
 
-demSpgp1dPlot
\ No newline at end of file
+demSpgp1dPlot
diff --git a/demSpgp1dGp5.m b/gp/demSpgp1dGp5.m
similarity index 98%
rename from demSpgp1dGp5.m
rename to gp/demSpgp1dGp5.m
index 801ee669..327f7c5f 100644
--- a/demSpgp1dGp5.m
+++ b/gp/demSpgp1dGp5.m
@@ -1,6 +1,6 @@
 % DEMSPGP1DGP5 Do a simple 1-D regression after Snelson & Ghahramani's example.
 
-% GPMAT
+% GP
 
 % Fix seeds
 randn('seed', 1e5);
diff --git a/demSpgp1dPlot.m b/gp/demSpgp1dPlot.m
similarity index 99%
rename from demSpgp1dPlot.m
rename to gp/demSpgp1dPlot.m
index 1879abe0..d07e436e 100644
--- a/demSpgp1dPlot.m
+++ b/gp/demSpgp1dPlot.m
@@ -1,6 +1,6 @@
 % DEMSPGP1DPLOT Plot results from 1-D sparse GP.
 
-% GPMAT
+% GP
 
 fillColor = [0.7 0.7 0.7];
 xTest = linspace(-1.5, 1.5, 200)';
diff --git a/demStickGp1.m b/gp/demStickGp1.m
similarity index 99%
rename from demStickGp1.m
rename to gp/demStickGp1.m
index 9d394141..0f0ed71e 100644
--- a/demStickGp1.m
+++ b/gp/demStickGp1.m
@@ -6,7 +6,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 randn('seed', 1e7)
 rand('seed', 1e7)
@@ -75,4 +75,4 @@
     fileName = ['dem' capName 'Gp' num2str(experimentNo) 'Out' num2str(i)];
     printPlot(fileName, '../tex/diagrams', '../html');
   end
-end
\ No newline at end of file
+end
diff --git a/gpBlockIndices.m b/gp/gpBlockIndices.m
similarity index 98%
rename from gpBlockIndices.m
rename to gp/gpBlockIndices.m
index dee529f4..d886e087 100644
--- a/gpBlockIndices.m
+++ b/gp/gpBlockIndices.m
@@ -14,7 +14,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006
 
-% GPMAT
+% GP
 
 
 if ~strcmp(model.approx, 'pitc')
diff --git a/gpComputeAlpha.m b/gp/gpComputeAlpha.m
similarity index 99%
rename from gpComputeAlpha.m
rename to gp/gpComputeAlpha.m
index 88df4439..80393ccf 100644
--- a/gpComputeAlpha.m
+++ b/gp/gpComputeAlpha.m
@@ -13,7 +13,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006, 2009
 
-% GPMAT
+% GP
 
 if nargin < 2
   m = model.m;
@@ -73,4 +73,4 @@
       end
     end  
   end
-end
\ No newline at end of file
+end
diff --git a/gpComputeObservationLogLikelihood.m b/gp/gpComputeObservationLogLikelihood.m
similarity index 98%
rename from gpComputeObservationLogLikelihood.m
rename to gp/gpComputeObservationLogLikelihood.m
index 8dfc4bc2..b51fbd95 100644
--- a/gpComputeObservationLogLikelihood.m
+++ b/gp/gpComputeObservationLogLikelihood.m
@@ -11,7 +11,7 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2010
 
-% GPMAT
+% GP
   
   if(verbose)
     handle_waitbar = waitbar(0,'Computing Observation Loglikelihood');
@@ -44,4 +44,4 @@
   end
 
   return;
-end
\ No newline at end of file
+end
diff --git a/gpComputeTranslationLogLikelihood.m b/gp/gpComputeTranslationLogLikelihood.m
similarity index 99%
rename from gpComputeTranslationLogLikelihood.m
rename to gp/gpComputeTranslationLogLikelihood.m
index 2d854aec..b48dc157 100644
--- a/gpComputeTranslationLogLikelihood.m
+++ b/gp/gpComputeTranslationLogLikelihood.m
@@ -10,7 +10,7 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2010
 
-% GPMAT
+% GP
 
 
 if(iscell(Xlabel)&&size(Xlabel{1},1)==1)
diff --git a/gpCovGrads.m b/gp/gpCovGrads.m
similarity index 99%
rename from gpCovGrads.m
rename to gp/gpCovGrads.m
index 1d5d055c..962b1299 100644
--- a/gpCovGrads.m
+++ b/gp/gpCovGrads.m
@@ -22,7 +22,7 @@
 %
 % SEEALSO : gpCreate, gpLogLikeGradient
 
-% GPMAT
+% GP
 
 switch model.approx
  case {'dtc', 'dtcvar'}
@@ -259,4 +259,4 @@
   end
  otherwise
   error('Unknown approximation type');
-end
\ No newline at end of file
+end
diff --git a/gpCovGradsTest.m b/gp/gpCovGradsTest.m
similarity index 99%
rename from gpCovGradsTest.m
rename to gp/gpCovGradsTest.m
index a09cffd2..62976683 100644
--- a/gpCovGradsTest.m
+++ b/gp/gpCovGradsTest.m
@@ -11,7 +11,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006, 2009
 
-% GPMAT
+% GP
 
 % WARNING --- this isn't testing g_Lambda in gpCovGrads
   
diff --git a/gpCreate.m b/gp/gpCreate.m
similarity index 99%
rename from gpCreate.m
rename to gp/gpCreate.m
index 30835306..6f071d9c 100644
--- a/gpCreate.m
+++ b/gp/gpCreate.m
@@ -17,7 +17,7 @@
 %
 % MODIFICATIONS : Cark Henrik Ek, 2007
 
-% GPMAT
+% GP
 
 if size(X, 2) ~= q
   error(['Input matrix X does not have dimension ' num2str(q)]);
diff --git a/gpDataIndices.m b/gp/gpDataIndices.m
similarity index 99%
rename from gpDataIndices.m
rename to gp/gpDataIndices.m
index 3e300c7a..8783e982 100644
--- a/gpDataIndices.m
+++ b/gp/gpDataIndices.m
@@ -24,7 +24,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006
 
-% GPMAT
+% GP
 
 
 if nargin > 2
diff --git a/gpDeconstruct.m b/gp/gpDeconstruct.m
similarity index 99%
rename from gpDeconstruct.m
rename to gp/gpDeconstruct.m
index b17ac779..5724f1f8 100644
--- a/gpDeconstruct.m
+++ b/gp/gpDeconstruct.m
@@ -15,7 +15,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2007, 2009
 
-% GPMAT
+% GP
 
 kern = model.kern;
 if isfield(model, 'noise')
diff --git a/gpDisplay.m b/gp/gpDisplay.m
similarity index 99%
rename from gpDisplay.m
rename to gp/gpDisplay.m
index c71dd66a..b2251c97 100644
--- a/gpDisplay.m
+++ b/gp/gpDisplay.m
@@ -12,7 +12,7 @@ function gpDisplay(model, spaceNum)
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 if nargin > 1
   spacing = repmat(32, 1, spaceNum);
diff --git a/gpExpandParam.m b/gp/gpExpandParam.m
similarity index 99%
rename from gpExpandParam.m
rename to gp/gpExpandParam.m
index ef7bf46e..4bfcabaf 100644
--- a/gpExpandParam.m
+++ b/gp/gpExpandParam.m
@@ -17,7 +17,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 if isfield(model, 'fix')
   for i = 1:length(model.fix)
diff --git a/gpExtractParam.m b/gp/gpExtractParam.m
similarity index 99%
rename from gpExtractParam.m
rename to gp/gpExtractParam.m
index 8536fed1..563680eb 100644
--- a/gpExtractParam.m
+++ b/gp/gpExtractParam.m
@@ -18,7 +18,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2007, 2009
 
-% GPMAT
+% GP
 
 if nargout > 1
   returnNames = true;
@@ -109,4 +109,4 @@
       names = {X_uNames{:}, names{:}};
     end
   end
-end
\ No newline at end of file
+end
diff --git a/gpGradient.m b/gp/gpGradient.m
similarity index 98%
rename from gpGradient.m
rename to gp/gpGradient.m
index 718619ff..9e7a43a9 100644
--- a/gpGradient.m
+++ b/gp/gpGradient.m
@@ -14,7 +14,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006
 
-% GPMAT
+% GP
 
 model = gpExpandParam(model, params);
 g = - gpLogLikeGradients(model);
diff --git a/gpLoadResult.m b/gp/gpLoadResult.m
similarity index 98%
rename from gpLoadResult.m
rename to gp/gpLoadResult.m
index c8557102..25905a7b 100644
--- a/gpLoadResult.m
+++ b/gp/gpLoadResult.m
@@ -11,7 +11,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2003, 2004, 2005, 2006, 2008, 2011
   
-% GPMAT
+% GP
 
   if nargin < 3 
     dataLoaderStr = 'mapLoadData';
@@ -22,4 +22,4 @@
   dataSet(1) = upper(dataSet(1));
   load(['dem' dataSet 'Gp' num2str(number)])
   model = gpReconstruct(kern, noise, gpInfo, X, y);
-end
\ No newline at end of file
+end
diff --git a/gpLogLikeGradients.m b/gp/gpLogLikeGradients.m
similarity index 99%
rename from gpLogLikeGradients.m
rename to gp/gpLogLikeGradients.m
index cdb6c81c..ee05048f 100644
--- a/gpLogLikeGradients.m
+++ b/gp/gpLogLikeGradients.m
@@ -64,7 +64,7 @@
 %
 % MODIFICATIONS : Carl Henrik Ek, 2008
 
-% GPMAT
+% GP
 
   if nargin < 4
     if isfield(model, 'X_u')
diff --git a/gpLogLikelihood.m b/gp/gpLogLikelihood.m
similarity index 99%
rename from gpLogLikelihood.m
rename to gp/gpLogLikelihood.m
index 96c3d299..017beecc 100644
--- a/gpLogLikelihood.m
+++ b/gp/gpLogLikelihood.m
@@ -11,7 +11,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 
 switch model.approx
@@ -190,4 +190,4 @@
 if model.learnScales
   ll = ll - sum(log(model.scale));
 end
-ll = ll - model.d*model.N/2*log(2*pi);
\ No newline at end of file
+ll = ll - model.d*model.N/2*log(2*pi);
diff --git a/gpMeanFunctionGradient.m b/gp/gpMeanFunctionGradient.m
similarity index 99%
rename from gpMeanFunctionGradient.m
rename to gp/gpMeanFunctionGradient.m
index e0bf883e..e271d57a 100644
--- a/gpMeanFunctionGradient.m
+++ b/gp/gpMeanFunctionGradient.m
@@ -13,7 +13,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006, 2009
 
-% GPMAT
+% GP
 
 if isfield(model, 'isSpherical') & ~model.isSpherical
   error('Currently only implemented for spherical');
diff --git a/gpObjective.m b/gp/gpObjective.m
similarity index 98%
rename from gpObjective.m
rename to gp/gpObjective.m
index 13dea176..6b43c5e6 100644
--- a/gpObjective.m
+++ b/gp/gpObjective.m
@@ -16,7 +16,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006
 
-% GPMAT
+% GP
 
 model = gpExpandParam(model, params);
 f = - gpLogLikelihood(model);
diff --git a/gpObjectiveGradient.m b/gp/gpObjectiveGradient.m
similarity index 99%
rename from gpObjectiveGradient.m
rename to gp/gpObjectiveGradient.m
index f0b38a2f..52148ef0 100644
--- a/gpObjectiveGradient.m
+++ b/gp/gpObjectiveGradient.m
@@ -18,7 +18,7 @@
 % 
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006
 
-% GPMAT
+% GP
 
 % Check how the optimiser has given the parameters
 if size(params, 1) > size(params, 2)
@@ -36,4 +36,4 @@
 end
 if transpose
   g = g';
-end
\ No newline at end of file
+end
diff --git a/gpOptimise.m b/gp/gpOptimise.m
similarity index 99%
rename from gpOptimise.m
rename to gp/gpOptimise.m
index d0f10d88..99698e81 100644
--- a/gpOptimise.m
+++ b/gp/gpOptimise.m
@@ -17,7 +17,7 @@
 %
 % MODIFICATIONS : Carl Henrik Ek, 2008
 
-% GPMAT
+% GP
 
 if(nargin<4)
   gradcheck = false;
diff --git a/gpOptions.m b/gp/gpOptions.m
similarity index 98%
rename from gpOptions.m
rename to gp/gpOptions.m
index 69775c9c..1d94c1fb 100644
--- a/gpOptions.m
+++ b/gp/gpOptions.m
@@ -14,7 +14,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2007, 2009
 
-% GPMAT
+% GP
 
 if nargin < 1
   options.approx = 'ftc';
@@ -66,4 +66,4 @@
   options.fixIndices = [];
 end
 
-options.computeS = false;
\ No newline at end of file
+options.computeS = false;
diff --git a/gpOut.m b/gp/gpOut.m
similarity index 98%
rename from gpOut.m
rename to gp/gpOut.m
index 914fd521..3c45e3d4 100644
--- a/gpOut.m
+++ b/gp/gpOut.m
@@ -13,7 +13,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence and Carl Ek, 2006
 
-% GPMAT 
+% GP 
 
 if nargin < 2
   % This implies evaluate for the training data.
diff --git a/gpPointLogLikelihood.m b/gp/gpPointLogLikelihood.m
similarity index 98%
rename from gpPointLogLikelihood.m
rename to gp/gpPointLogLikelihood.m
index f25ff503..31e46de6 100644
--- a/gpPointLogLikelihood.m
+++ b/gp/gpPointLogLikelihood.m
@@ -15,7 +15,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006
 
-% GPMAT
+% GP
 
 logTwoPi = log(2*pi);
 [mu, varSigma] = gpPosteriorMeanVar(model, x);
diff --git a/gpPosteriorGradMeanCovar.m b/gp/gpPosteriorGradMeanCovar.m
similarity index 99%
rename from gpPosteriorGradMeanCovar.m
rename to gp/gpPosteriorGradMeanCovar.m
index 17247cbc..18ee5823 100644
--- a/gpPosteriorGradMeanCovar.m
+++ b/gp/gpPosteriorGradMeanCovar.m
@@ -36,7 +36,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 
 if ~isfield(model, 'alpha')
@@ -87,4 +87,4 @@
   end
 else
   error('Not yet implemented for models trained on missing data.');
-end
\ No newline at end of file
+end
diff --git a/gpPosteriorGradMeanVar.m b/gp/gpPosteriorGradMeanVar.m
similarity index 99%
rename from gpPosteriorGradMeanVar.m
rename to gp/gpPosteriorGradMeanVar.m
index dcd049cd..8c99905f 100644
--- a/gpPosteriorGradMeanVar.m
+++ b/gp/gpPosteriorGradMeanVar.m
@@ -16,7 +16,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 
 if ~isfield(model, 'alpha')
@@ -56,4 +56,4 @@
 gmu = gX'*model.alpha;
 
 gmu = gmu.*repmat(model.scale, model.q, 1);
-gsigmavar = gsigmavar.*repmat(model.scale.*model.scale, model.q, 1);
\ No newline at end of file
+gsigmavar = gsigmavar.*repmat(model.scale.*model.scale, model.q, 1);
diff --git a/gpPosteriorMeanCovar.m b/gp/gpPosteriorMeanCovar.m
similarity index 99%
rename from gpPosteriorMeanCovar.m
rename to gp/gpPosteriorMeanCovar.m
index 431ae5f5..2343fb7b 100644
--- a/gpPosteriorMeanCovar.m
+++ b/gp/gpPosteriorMeanCovar.m
@@ -27,7 +27,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006, 2009
 
-% GPMAT
+% GP
 
 % Just call gpPosteriorMeanVar for means.
 mu = gpPosteriorMeanVar(model, X);
diff --git a/gpPosteriorMeanCovarTest.m b/gp/gpPosteriorMeanCovarTest.m
similarity index 99%
rename from gpPosteriorMeanCovarTest.m
rename to gp/gpPosteriorMeanCovarTest.m
index e820b835..b0ee23c7 100644
--- a/gpPosteriorMeanCovarTest.m
+++ b/gp/gpPosteriorMeanCovarTest.m
@@ -20,7 +20,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006
 
-% GPMAT
+% GP
 
 [analMu, analCov] = gpPosteriorGradMeanCovar(model, X);
 origX = X;
@@ -40,4 +40,4 @@
     end
     
   end
-end
\ No newline at end of file
+end
diff --git a/gpPosteriorMeanVar.m b/gp/gpPosteriorMeanVar.m
similarity index 99%
rename from gpPosteriorMeanVar.m
rename to gp/gpPosteriorMeanVar.m
index 68df6ad7..022d8962 100644
--- a/gpPosteriorMeanVar.m
+++ b/gp/gpPosteriorMeanVar.m
@@ -14,7 +14,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 model.m = gpComputeM(model);
 if ~isfield(model, 'alpha')
@@ -116,4 +116,4 @@
   if endVal > size(X, 1)
     endVal = size(X, 1);
   end
-end
\ No newline at end of file
+end
diff --git a/gpPosteriorSample.m b/gp/gpPosteriorSample.m
similarity index 99%
rename from gpPosteriorSample.m
rename to gp/gpPosteriorSample.m
index ac867983..50d553c5 100644
--- a/gpPosteriorSample.m
+++ b/gp/gpPosteriorSample.m
@@ -11,7 +11,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 global printDiagram
   
diff --git a/gpPosteriorVar.m b/gp/gpPosteriorVar.m
similarity index 99%
rename from gpPosteriorVar.m
rename to gp/gpPosteriorVar.m
index 57e5000b..f8c8580c 100644
--- a/gpPosteriorVar.m
+++ b/gp/gpPosteriorVar.m
@@ -13,7 +13,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
-% GPMAT
+% GP
 
 
 maxMemory = 1000000;
@@ -94,4 +94,4 @@
   if endVal > size(X, 1)
     endVal = size(X, 1);
   end
-end
\ No newline at end of file
+end
diff --git a/gpReadFromFID.m b/gp/gpReadFromFID.m
similarity index 99%
rename from gpReadFromFID.m
rename to gp/gpReadFromFID.m
index ea9be68d..416a635e 100644
--- a/gpReadFromFID.m
+++ b/gp/gpReadFromFID.m
@@ -11,7 +11,7 @@
 %
 % SEEALSO : gpReadFromFile
 
-% GPMAT
+% GP
 
 try
   version = readVersionFromFID(FID);
diff --git a/gpReadFromFile.m b/gp/gpReadFromFile.m
similarity index 96%
rename from gpReadFromFile.m
rename to gp/gpReadFromFile.m
index 269ebb28..f049a0fe 100644
--- a/gpReadFromFile.m
+++ b/gp/gpReadFromFile.m
@@ -12,11 +12,11 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005
 
-% GPMAT
+% GP
 
 FID = fopen(fileName);
 if FID==-1
   error(['Cannot find file ' fileName])
 end
 model = gpReadFromFID(FID, varargin{:});
-fclose(FID);
\ No newline at end of file
+fclose(FID);
diff --git a/gpReconstruct.m b/gp/gpReconstruct.m
similarity index 99%
rename from gpReconstruct.m
rename to gp/gpReconstruct.m
index 43045a5d..66f85bd0 100644
--- a/gpReconstruct.m
+++ b/gp/gpReconstruct.m
@@ -17,7 +17,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2007, 2009
 
-% GPMAT
+% GP
 
   model = gpInfo;
   model.X = X;
diff --git a/gpSample.m b/gp/gpSample.m
similarity index 99%
rename from gpSample.m
rename to gp/gpSample.m
index 62364267..780bae18 100644
--- a/gpSample.m
+++ b/gp/gpSample.m
@@ -11,7 +11,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
   
 if nargin < 6
   bw = false;
diff --git a/gpScaleBiasGradient.m b/gp/gpScaleBiasGradient.m
similarity index 98%
rename from gpScaleBiasGradient.m
rename to gp/gpScaleBiasGradient.m
index 8c06d8f8..a1fea6dc 100644
--- a/gpScaleBiasGradient.m
+++ b/gp/gpScaleBiasGradient.m
@@ -13,7 +13,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2006
 
-% GPMAT
+% GP
 
 g = [];
 if model.learnScales
diff --git a/gpSubspaceCreate.m b/gp/gpSubspaceCreate.m
similarity index 92%
rename from gpSubspaceCreate.m
rename to gp/gpSubspaceCreate.m
index 407c90fc..15d3beaf 100644
--- a/gpSubspaceCreate.m
+++ b/gp/gpSubspaceCreate.m
@@ -4,10 +4,10 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2008
 
-% GPMAT
+% GP
   
 model = gpCreate(q,d,X,y,options);
 model.dim = dim;
 model.type = 'gpSubspace';
 
-return;
\ No newline at end of file
+return;
diff --git a/gpSubspaceExpandParam.m b/gp/gpSubspaceExpandParam.m
similarity index 91%
rename from gpSubspaceExpandParam.m
rename to gp/gpSubspaceExpandParam.m
index 8f0c98a7..1eb500ce 100644
--- a/gpSubspaceExpandParam.m
+++ b/gp/gpSubspaceExpandParam.m
@@ -4,8 +4,8 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2008
 
-% GPMAT
+% GP
   
 model = gpExpandParam(model,params);
 
-return;
\ No newline at end of file
+return;
diff --git a/gpSubspaceExtractParam.m b/gp/gpSubspaceExtractParam.m
similarity index 90%
rename from gpSubspaceExtractParam.m
rename to gp/gpSubspaceExtractParam.m
index a234c363..0cfc47d8 100644
--- a/gpSubspaceExtractParam.m
+++ b/gp/gpSubspaceExtractParam.m
@@ -4,8 +4,8 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2008
   
-% GPMAT 
+% GP 
   
 params = gpExtractParam(model);
 
-return;
\ No newline at end of file
+return;
diff --git a/gpSubspaceOptimise.m b/gp/gpSubspaceOptimise.m
similarity index 91%
rename from gpSubspaceOptimise.m
rename to gp/gpSubspaceOptimise.m
index 2aaba595..c5829d95 100644
--- a/gpSubspaceOptimise.m
+++ b/gp/gpSubspaceOptimise.m
@@ -4,8 +4,8 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2008
   
-% GPMAT
+% GP
 
 model = gpOptimise(model,varargin{:});
 
-return;
\ No newline at end of file
+return;
diff --git a/gpSubspaceOut.m b/gp/gpSubspaceOut.m
similarity index 91%
rename from gpSubspaceOut.m
rename to gp/gpSubspaceOut.m
index 41bc56f7..480dfe29 100644
--- a/gpSubspaceOut.m
+++ b/gp/gpSubspaceOut.m
@@ -4,9 +4,9 @@
 %
 % COPYRIGHT : Carl Henrik Ek, 2008
 
-% GPMAT 
+% GP 
   
 y = NaN.*ones(size(x,1),length(model.dim));
 y(:,find(model.dim)) = gpOut(model,x);
 
-return;
\ No newline at end of file
+return;
diff --git a/gpTest.m b/gp/gpTest.m
similarity index 99%
rename from gpTest.m
rename to gp/gpTest.m
index 31080e0a..e287771e 100644
--- a/gpTest.m
+++ b/gp/gpTest.m
@@ -11,7 +11,7 @@
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2009
 
 
-% GPMAT
+% GP
 
 q = 2;
 d = 3;
@@ -92,4 +92,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/gpTwoSample.m b/gp/gpTwoSample.m
similarity index 99%
rename from gpTwoSample.m
rename to gp/gpTwoSample.m
index 5927c25a..f59d88e2 100644
--- a/gpTwoSample.m
+++ b/gp/gpTwoSample.m
@@ -17,7 +17,7 @@
 %
 % SEEALSO : multimodelCreate, gpCreate
 
-% GPMAT
+% GP
 maxIters = 500;
 display = 0;
 tTemp = sort(t{1});
diff --git a/gpUpdateAD.m b/gp/gpUpdateAD.m
similarity index 99%
rename from gpUpdateAD.m
rename to gp/gpUpdateAD.m
index 4e35d3f3..87a0c768 100644
--- a/gpUpdateAD.m
+++ b/gp/gpUpdateAD.m
@@ -15,7 +15,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence 2006, 2009
 
-% GPMAT
+% GP
 
 if nargin < 2
   X = model.X;
diff --git a/gpUpdateKernels.m b/gp/gpUpdateKernels.m
similarity index 99%
rename from gpUpdateKernels.m
rename to gp/gpUpdateKernels.m
index a9ae89f7..a8011ba9 100644
--- a/gpUpdateKernels.m
+++ b/gp/gpUpdateKernels.m
@@ -20,7 +20,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2005, 2006, 2007, 2009
 
-% GPMAT
+% GP
 
 jitter = 1e-6;
 
diff --git a/gpWriteResult.m b/gp/gpWriteResult.m
similarity index 91%
rename from gpWriteResult.m
rename to gp/gpWriteResult.m
index d217ac15..db398429 100644
--- a/gpWriteResult.m
+++ b/gp/gpWriteResult.m
@@ -12,7 +12,7 @@
 %
 % COPYRIGHT : Neil D. Lawrence, 2009
   
-% GPMAT
+% GP
 
 dataSet(1) = upper(dataSet(1));
 type = model.type;
@@ -21,4 +21,4 @@
 
 [kern, noise, gpInfo] = gpDeconstruct(model);
 
-save(fileName, 'kern', 'noise', 'gpInfo');
\ No newline at end of file
+save(fileName, 'kern', 'noise', 'gpInfo');
diff --git a/gpWriteToFile.m b/gp/gpWriteToFile.m
similarity index 96%
rename from gpWriteToFile.m
rename to gp/gpWriteToFile.m
index 48a725fe..29404d3c 100644
--- a/gpWriteToFile.m
+++ b/gp/gpWriteToFile.m
@@ -12,11 +12,11 @@ function gpWriteToFile(fileName, model)
 %
 % COPYRIGHT : Neil D. Lawrence, 2008
 
-% GPMAT
+% GP
 
 FID = fopen(fileName, 'w');
 if FID==-1
   error(['Cannot open file ' fileName])
 end
 gpWriteToFID(FID, model);
-fclose(FID);
\ No newline at end of file
+fclose(FID);