diff --git a/DataGrid/Action.php b/Action.php
similarity index 100%
rename from DataGrid/Action.php
rename to Action.php
diff --git a/DataGrid/Columns/ActionColumn.php b/Columns/ActionColumn.php
similarity index 100%
rename from DataGrid/Columns/ActionColumn.php
rename to Columns/ActionColumn.php
diff --git a/DataGrid/Columns/CheckboxColumn.php b/Columns/CheckboxColumn.php
similarity index 100%
rename from DataGrid/Columns/CheckboxColumn.php
rename to Columns/CheckboxColumn.php
diff --git a/DataGrid/Columns/Column.php b/Columns/Column.php
similarity index 100%
rename from DataGrid/Columns/Column.php
rename to Columns/Column.php
diff --git a/DataGrid/Columns/DateColumn.php b/Columns/DateColumn.php
similarity index 100%
rename from DataGrid/Columns/DateColumn.php
rename to Columns/DateColumn.php
diff --git a/DataGrid/Columns/IColumn.php b/Columns/IColumn.php
similarity index 100%
rename from DataGrid/Columns/IColumn.php
rename to Columns/IColumn.php
diff --git a/DataGrid/Columns/ImageColumn.php b/Columns/ImageColumn.php
similarity index 100%
rename from DataGrid/Columns/ImageColumn.php
rename to Columns/ImageColumn.php
diff --git a/DataGrid/Columns/NumericColumn.php b/Columns/NumericColumn.php
similarity index 100%
rename from DataGrid/Columns/NumericColumn.php
rename to Columns/NumericColumn.php
diff --git a/DataGrid/Columns/PositionColumn.php b/Columns/PositionColumn.php
similarity index 100%
rename from DataGrid/Columns/PositionColumn.php
rename to Columns/PositionColumn.php
diff --git a/DataGrid/Columns/TextColumn.php b/Columns/TextColumn.php
similarity index 100%
rename from DataGrid/Columns/TextColumn.php
rename to Columns/TextColumn.php
diff --git a/DataGrid/DataGrid.php b/DataGrid.php
similarity index 100%
rename from DataGrid/DataGrid.php
rename to DataGrid.php
diff --git a/DataGrid/DataSources/DataSource.php b/DataSources/DataSource.php
similarity index 100%
rename from DataGrid/DataSources/DataSource.php
rename to DataSources/DataSource.php
diff --git a/DataGrid/DataSources/Doctrine/Mapped.php b/DataSources/Doctrine/Mapped.php
similarity index 100%
rename from DataGrid/DataSources/Doctrine/Mapped.php
rename to DataSources/Doctrine/Mapped.php
diff --git a/DataGrid/DataSources/Doctrine/QueryBuilder.php b/DataSources/Doctrine/QueryBuilder.php
similarity index 100%
rename from DataGrid/DataSources/Doctrine/QueryBuilder.php
rename to DataSources/Doctrine/QueryBuilder.php
diff --git a/DataGrid/DataSources/Doctrine/Utils/CountingASTWalker.php b/DataSources/Doctrine/Utils/CountingASTWalker.php
similarity index 100%
rename from DataGrid/DataSources/Doctrine/Utils/CountingASTWalker.php
rename to DataSources/Doctrine/Utils/CountingASTWalker.php
diff --git a/DataGrid/DataSources/Doctrine/Utils/WildcardHelper.php b/DataSources/Doctrine/Utils/WildcardHelper.php
similarity index 100%
rename from DataGrid/DataSources/Doctrine/Utils/WildcardHelper.php
rename to DataSources/Doctrine/Utils/WildcardHelper.php
diff --git a/DataGrid/DataSources/IDataSource.php b/DataSources/IDataSource.php
similarity index 100%
rename from DataGrid/DataSources/IDataSource.php
rename to DataSources/IDataSource.php
diff --git a/DataGrid/DataSources/PHPArray/PHPArray.php b/DataSources/PHPArray/PHPArray.php
similarity index 100%
rename from DataGrid/DataSources/PHPArray/PHPArray.php
rename to DataSources/PHPArray/PHPArray.php
diff --git a/DataGrid/Filters/CheckboxFilter.php b/Filters/CheckboxFilter.php
similarity index 100%
rename from DataGrid/Filters/CheckboxFilter.php
rename to Filters/CheckboxFilter.php
diff --git a/DataGrid/Filters/ColumnFilter.php b/Filters/ColumnFilter.php
similarity index 100%
rename from DataGrid/Filters/ColumnFilter.php
rename to Filters/ColumnFilter.php
diff --git a/DataGrid/Filters/DateFilter.php b/Filters/DateFilter.php
similarity index 100%
rename from DataGrid/Filters/DateFilter.php
rename to Filters/DateFilter.php
diff --git a/DataGrid/Filters/IColumnFilter.php b/Filters/IColumnFilter.php
similarity index 100%
rename from DataGrid/Filters/IColumnFilter.php
rename to Filters/IColumnFilter.php
diff --git a/DataGrid/Filters/SelectboxFilter.php b/Filters/SelectboxFilter.php
similarity index 100%
rename from DataGrid/Filters/SelectboxFilter.php
rename to Filters/SelectboxFilter.php
diff --git a/DataGrid/Filters/TextFilter.php b/Filters/TextFilter.php
similarity index 100%
rename from DataGrid/Filters/TextFilter.php
rename to Filters/TextFilter.php
diff --git a/DataGrid/IAction.php b/IAction.php
similarity index 100%
rename from DataGrid/IAction.php
rename to IAction.php
diff --git a/DataGrid/Renderers/Conventional/Renderer.php b/Renderers/Conventional/Renderer.php
similarity index 100%
rename from DataGrid/Renderers/Conventional/Renderer.php
rename to Renderers/Conventional/Renderer.php
diff --git a/DataGrid/Renderers/Conventional/grid.phtml b/Renderers/Conventional/grid.phtml
similarity index 100%
rename from DataGrid/Renderers/Conventional/grid.phtml
rename to Renderers/Conventional/grid.phtml
diff --git a/DataGrid/Renderers/IRenderer.php b/Renderers/IRenderer.php
similarity index 100%
rename from DataGrid/Renderers/IRenderer.php
rename to Renderers/IRenderer.php
diff --git a/DataGrid/todo.txt b/todo.txt
similarity index 100%
rename from DataGrid/todo.txt
rename to todo.txt