diff --git a/.gitattributes b/.gitattributes
index b2b36b30e2..4cc15ec402 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2932,6 +2932,9 @@ components/tachart/Makefile svneol=native#text/plain
 components/tachart/Makefile.compiled svneol=native#text/plain
 components/tachart/Makefile.fpc svneol=native#text/plain
 components/tachart/README.txt svneol=native#text/plain
+components/tachart/aggpas/tachartaggpas.lpk svneol=native#text/pascal
+components/tachart/aggpas/tachartaggpas.pas svneol=native#text/pascal
+components/tachart/aggpas/tadraweraggpas.pas svneol=native#text/pascal
 components/tachart/demo/3d/main.lfm svneol=native#text/plain
 components/tachart/demo/3d/main.pas svneol=native#text/plain
 components/tachart/demo/3d/zdemo.lpi svneol=native#text/plain
@@ -3118,8 +3121,6 @@ components/tachart/numlib_fix/sle.pas svneol=native#text/pascal
 components/tachart/numlib_fix/spe.pas svneol=native#text/pascal
 components/tachart/taanimatedsource.pas svneol=native#text/pascal
 components/tachart/taaxissource.pas svneol=native#text/pascal
-components/tachart/tachartaggpas.lpk svneol=native#text/pascal
-components/tachart/tachartaggpas.pas svneol=native#text/pascal
 components/tachart/tachartaxis.pas svneol=native#text/pascal
 components/tachart/tachartaxisutils.pas svneol=native#text/pascal
 components/tachart/tachartbgra.lpk svneol=native#text/pascal
@@ -3142,7 +3143,6 @@ components/tachart/tacustomseries.pas svneol=native#text/plain
 components/tachart/tacustomsource.pas svneol=native#text/pascal
 components/tachart/tadatatools.pas svneol=native#text/pascal
 components/tachart/tadbsource.pas svneol=native#text/pascal
-components/tachart/tadraweraggpas.pas svneol=native#text/pascal
 components/tachart/tadrawerbgra.pas svneol=native#text/pascal
 components/tachart/tadrawercanvas.pas svneol=native#text/pascal
 components/tachart/tadrawerfpcanvas.pas svneol=native#text/pascal
diff --git a/.gitignore b/.gitignore
index bdf6d21bce..491fdd6eb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,7 @@ components/synunihighlighter/languages/units
 components/synunihighlighter/lib/*.bak
 components/synunihighlighter/lib/units
 components/synunihighlighter/units
+components/tachart/aggpas/lib
 components/tachart/demo/3d/*.exe
 components/tachart/demo/3d/*.lps
 components/tachart/demo/3d/lib
diff --git a/components/tachart/tachartaggpas.lpk b/components/tachart/aggpas/tachartaggpas.lpk
similarity index 100%
rename from components/tachart/tachartaggpas.lpk
rename to components/tachart/aggpas/tachartaggpas.lpk
diff --git a/components/tachart/tachartaggpas.pas b/components/tachart/aggpas/tachartaggpas.pas
similarity index 100%
rename from components/tachart/tachartaggpas.pas
rename to components/tachart/aggpas/tachartaggpas.pas
diff --git a/components/tachart/tadraweraggpas.pas b/components/tachart/aggpas/tadraweraggpas.pas
similarity index 100%
rename from components/tachart/tadraweraggpas.pas
rename to components/tachart/aggpas/tadraweraggpas.pas