diff --git a/manual/codes/Basic Components - Collection - Collection expanding.php b/manual/codes/Advanced components - Db_Profiler - Advanced usage.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Collection expanding.php
rename to manual/codes/Advanced components - Db_Profiler - Advanced usage.php
diff --git a/manual/codes/Basic Components - Connection - Available drivers.php b/manual/codes/Advanced components - Db_Profiler - Basic usage.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Available drivers.php
rename to manual/codes/Advanced components - Db_Profiler - Basic usage.php
diff --git a/manual/codes/Basic Components - Connection - Availible drivers.php b/manual/codes/Advanced components - Db_Profiler - Introduction.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Availible drivers.php
rename to manual/codes/Advanced components - Db_Profiler - Introduction.php
diff --git a/manual/codes/Basic Components - Db - Introduction.php b/manual/codes/Advanced components - Eventlisteners - AccessorInvoker.php
similarity index 100%
rename from manual/codes/Basic Components - Db - Introduction.php
rename to manual/codes/Advanced components - Eventlisteners - AccessorInvoker.php
diff --git a/manual/codes/Basic Components - Exceptions - List of exceptions.php b/manual/codes/Advanced components - Eventlisteners - Creating a logger.php
similarity index 100%
rename from manual/codes/Basic Components - Exceptions - List of exceptions.php
rename to manual/codes/Advanced components - Eventlisteners - Creating a logger.php
diff --git a/manual/codes/Basic Components - Exceptions - Overview.php b/manual/codes/Advanced components - Hook - Building queries.php
similarity index 100%
rename from manual/codes/Basic Components - Exceptions - Overview.php
rename to manual/codes/Advanced components - Hook - Building queries.php
diff --git a/manual/codes/Basic Components - Manager - Introduction.php b/manual/codes/Advanced components - Hook - Introduction.php
similarity index 100%
rename from manual/codes/Basic Components - Manager - Introduction.php
rename to manual/codes/Advanced components - Hook - Introduction.php
diff --git a/manual/codes/Basic Components - Query - DQL - SQL conversion.php b/manual/codes/Advanced components - Hook - List of parsers.php
similarity index 100%
rename from manual/codes/Basic Components - Query - DQL - SQL conversion.php
rename to manual/codes/Advanced components - Hook - List of parsers.php
diff --git a/manual/codes/Basic Components - RawSql - Introduction.php b/manual/codes/Coding standards - Testing - Writing tests.php
similarity index 100%
rename from manual/codes/Basic Components - RawSql - Introduction.php
rename to manual/codes/Coding standards - Testing - Writing tests.php
diff --git a/manual/codes/Basic Components - Record - Callbacks.php b/manual/codes/Configuration - Setting attributes - Identifier quoting.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Callbacks.php
rename to manual/codes/Configuration - Setting attributes - Identifier quoting.php
diff --git a/manual/codes/Basic Components - Record - Introduction.php b/manual/codes/Configuration - Setting attributes - Portability.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Introduction.php
rename to manual/codes/Configuration - Setting attributes - Portability.php
diff --git a/manual/codes/Basic Components - Table - Getting relation objects.php b/manual/codes/Connection management - Connection-component binding.php
similarity index 100%
rename from manual/codes/Basic Components - Table - Getting relation objects.php
rename to manual/codes/Connection management - Connection-component binding.php
diff --git a/manual/codes/Basic Components - Table - Introduction.php b/manual/codes/Connection management - Lazy-connecting to database.php
similarity index 100%
rename from manual/codes/Basic Components - Table - Introduction.php
rename to manual/codes/Connection management - Lazy-connecting to database.php
diff --git a/manual/codes/Connection management - Managing connections.php b/manual/codes/Connection management - Managing connections.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection management - Opening a new connection.php b/manual/codes/Connection management - Opening a new connection.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - DataDict - Getting database declaration.php b/manual/codes/Connection modules - DataDict - Getting database declaration.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - DataDict - Getting portable type.php b/manual/codes/Connection modules - DataDict - Getting portable type.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - DataDict - Reserved keywords.php b/manual/codes/Connection modules - DataDict - Reserved keywords.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - Export - Introduction.php b/manual/codes/Connection modules - Export - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - Import - Getting foreign key info.php b/manual/codes/Connection modules - Import - Getting foreign key info.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - Import - Getting table info.php b/manual/codes/Connection modules - Import - Getting table info.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - Import - Getting view info.php b/manual/codes/Connection modules - Import - Getting view info.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - Import - Introduction.php b/manual/codes/Connection modules - Import - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Connection modules - Util - Using explain.php b/manual/codes/Connection modules - Util - Using explain.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - BNF.php b/manual/codes/DQL (Doctrine Query Language) - BNF.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - Conditional expressions - Collection Member Expressions.php b/manual/codes/DQL (Doctrine Query Language) - Conditional expressions - Collection Member Expressions.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - Conditional expressions - Empty Collection Comparison Expressions.php b/manual/codes/DQL (Doctrine Query Language) - Conditional expressions - Empty Collection Comparison Expressions.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - Conditional expressions - Null Comparison Expressions.php b/manual/codes/DQL (Doctrine Query Language) - Conditional expressions - Null Comparison Expressions.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - GROUP BY, HAVING.php b/manual/codes/DQL (Doctrine Query Language) - GROUP BY, HAVING.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET clauses - Driver portability.php b/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET clauses - Driver portability.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET clauses - Introduction.php b/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET clauses - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET clauses - The limit-subquery-algorithm.php b/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET clauses - The limit-subquery-algorithm.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET.php b/manual/codes/DQL (Doctrine Query Language) - LIMIT and OFFSET.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/DQL (Doctrine Query Language) - ORDER BY.php b/manual/codes/DQL (Doctrine Query Language) - ORDER BY.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Drivers - Mysql - Tips and tricks.php b/manual/codes/Drivers - Mysql - Tips and tricks.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Drivers - Oracle - Making unsuported functions work.php b/manual/codes/Drivers - Oracle - Making unsuported functions work.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Functions - Contains.php b/manual/codes/Functions - Contains.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Functions - Like.php b/manual/codes/Functions - Like.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Functions - Regexp.php b/manual/codes/Functions - Regexp.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Array.php b/manual/codes/Getting started - Data types - Array.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Blob.php b/manual/codes/Getting started - Data types - Blob.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Boolean.php b/manual/codes/Getting started - Data types - Boolean.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Clob.php b/manual/codes/Getting started - Data types - Clob.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Date.php b/manual/codes/Getting started - Data types - Date.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Enum.php b/manual/codes/Getting started - Data types - Enum.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Float.php b/manual/codes/Getting started - Data types - Float.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Gzip.php b/manual/codes/Getting started - Data types - Gzip.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Integer.php b/manual/codes/Getting started - Data types - Integer.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Object.php b/manual/codes/Getting started - Data types - Object.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - String.php b/manual/codes/Getting started - Data types - String.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Data types - Timestamp.php b/manual/codes/Getting started - Data types - Timestamp.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Getting started - Record identifiers - Sequence.php b/manual/codes/Getting started - Record identifiers - Sequence.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Native SQL - Component queries.php b/manual/codes/Native SQL - Component queries.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Native SQL - Fetching multiple components.php b/manual/codes/Native SQL - Fetching multiple components.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Native SQL - Scalar queries.php b/manual/codes/Native SQL - Scalar queries.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Object relational mapping - Columns - Data types - Introduction.php b/manual/codes/Object relational mapping - Columns - Data types - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Object relational mapping - Columns - Data types - Type modifiers.php b/manual/codes/Object relational mapping - Columns - Data types - Type modifiers.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Operators - Logical operators.php b/manual/codes/Operators - Logical operators.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Transactions - Deadlocks.php b/manual/codes/Transactions - Deadlocks.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Transactions - Isolation levels.php b/manual/codes/Transactions - Isolation levels.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Transactions - Lock modes.php b/manual/codes/Transactions - Lock modes.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Transactions - Savepoints.php b/manual/codes/Transactions - Savepoints.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Collection - Accessing elements.php b/manual/codes/Working with objects - Component overview - Collection - Accessing elements.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Accessing elements.php
rename to manual/codes/Working with objects - Component overview - Collection - Accessing elements.php
diff --git a/manual/codes/Basic Components - Collection - Adding new elements.php b/manual/codes/Working with objects - Component overview - Collection - Adding new elements.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Adding new elements.php
rename to manual/codes/Working with objects - Component overview - Collection - Adding new elements.php
diff --git a/manual/codes/Working with objects - Component overview - Collection - Collection expanding.php b/manual/codes/Working with objects - Component overview - Collection - Collection expanding.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Collection - Deleting collection.php b/manual/codes/Working with objects - Component overview - Collection - Deleting collection.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Deleting collection.php
rename to manual/codes/Working with objects - Component overview - Collection - Deleting collection.php
diff --git a/manual/codes/Basic Components - Collection - Fetching strategies.php b/manual/codes/Working with objects - Component overview - Collection - Fetching strategies.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Fetching strategies.php
rename to manual/codes/Working with objects - Component overview - Collection - Fetching strategies.php
diff --git a/manual/codes/Basic Components - Collection - Getting collection count.php b/manual/codes/Working with objects - Component overview - Collection - Getting collection count.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Getting collection count.php
rename to manual/codes/Working with objects - Component overview - Collection - Getting collection count.php
diff --git a/manual/codes/Basic Components - Collection - Introduction.php b/manual/codes/Working with objects - Component overview - Collection - Introduction.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Introduction.php
rename to manual/codes/Working with objects - Component overview - Collection - Introduction.php
diff --git a/manual/codes/Basic Components - Collection - Key mapping.php b/manual/codes/Working with objects - Component overview - Collection - Key mapping.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Key mapping.php
rename to manual/codes/Working with objects - Component overview - Collection - Key mapping.php
diff --git a/manual/codes/Basic Components - Collection - Loading related records.php b/manual/codes/Working with objects - Component overview - Collection - Loading related records.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Loading related records.php
rename to manual/codes/Working with objects - Component overview - Collection - Loading related records.php
diff --git a/manual/codes/Basic Components - Collection - Saving the collection.php b/manual/codes/Working with objects - Component overview - Collection - Saving the collection.php
similarity index 100%
rename from manual/codes/Basic Components - Collection - Saving the collection.php
rename to manual/codes/Working with objects - Component overview - Collection - Saving the collection.php
diff --git a/manual/codes/Working with objects - Component overview - Connection - Available drivers.php b/manual/codes/Working with objects - Component overview - Connection - Available drivers.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Working with objects - Component overview - Connection - Availible drivers.php b/manual/codes/Working with objects - Component overview - Connection - Availible drivers.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Connection - Flushing the connection.php b/manual/codes/Working with objects - Component overview - Connection - Flushing the connection.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Flushing the connection.php
rename to manual/codes/Working with objects - Component overview - Connection - Flushing the connection.php
diff --git a/manual/codes/Basic Components - Connection - Getting a table object.php b/manual/codes/Working with objects - Component overview - Connection - Getting a table object.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Getting a table object.php
rename to manual/codes/Working with objects - Component overview - Connection - Getting a table object.php
diff --git a/manual/codes/Basic Components - Connection - Getting connection state.php b/manual/codes/Working with objects - Component overview - Connection - Getting connection state.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Getting connection state.php
rename to manual/codes/Working with objects - Component overview - Connection - Getting connection state.php
diff --git a/manual/codes/Basic Components - Connection - Introduction.php b/manual/codes/Working with objects - Component overview - Connection - Introduction.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Introduction.php
rename to manual/codes/Working with objects - Component overview - Connection - Introduction.php
diff --git a/manual/codes/Basic Components - Connection - Querying the database.php b/manual/codes/Working with objects - Component overview - Connection - Querying the database.php
similarity index 100%
rename from manual/codes/Basic Components - Connection - Querying the database.php
rename to manual/codes/Working with objects - Component overview - Connection - Querying the database.php
diff --git a/manual/codes/Basic Components - Db - Chaining listeners.php b/manual/codes/Working with objects - Component overview - Db - Chaining listeners.php
similarity index 100%
rename from manual/codes/Basic Components - Db - Chaining listeners.php
rename to manual/codes/Working with objects - Component overview - Db - Chaining listeners.php
diff --git a/manual/codes/Basic Components - Db - Connecting to a database.php b/manual/codes/Working with objects - Component overview - Db - Connecting to a database.php
similarity index 100%
rename from manual/codes/Basic Components - Db - Connecting to a database.php
rename to manual/codes/Working with objects - Component overview - Db - Connecting to a database.php
diff --git a/manual/codes/Working with objects - Component overview - Db - Introduction.php b/manual/codes/Working with objects - Component overview - Db - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Db - Using event listeners.php b/manual/codes/Working with objects - Component overview - Db - Using event listeners.php
similarity index 100%
rename from manual/codes/Basic Components - Db - Using event listeners.php
rename to manual/codes/Working with objects - Component overview - Db - Using event listeners.php
diff --git a/manual/codes/Working with objects - Component overview - Exceptions - List of exceptions.php b/manual/codes/Working with objects - Component overview - Exceptions - List of exceptions.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Working with objects - Component overview - Exceptions - Overview.php b/manual/codes/Working with objects - Component overview - Exceptions - Overview.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Working with objects - Component overview - Manager - Introduction.php b/manual/codes/Working with objects - Component overview - Manager - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Manager - Managing connections.php b/manual/codes/Working with objects - Component overview - Manager - Managing connections.php
similarity index 100%
rename from manual/codes/Basic Components - Manager - Managing connections.php
rename to manual/codes/Working with objects - Component overview - Manager - Managing connections.php
diff --git a/manual/codes/Basic Components - Manager - Opening a new connection.php b/manual/codes/Working with objects - Component overview - Manager - Opening a new connection.php
similarity index 100%
rename from manual/codes/Basic Components - Manager - Opening a new connection.php
rename to manual/codes/Working with objects - Component overview - Manager - Opening a new connection.php
diff --git a/manual/codes/Basic Components - Query - Aggregate functions.php b/manual/codes/Working with objects - Component overview - Query - Aggregate functions.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Aggregate functions.php
rename to manual/codes/Working with objects - Component overview - Query - Aggregate functions.php
diff --git a/manual/codes/Basic Components - Query - Bound parameters.php b/manual/codes/Working with objects - Component overview - Query - Bound parameters.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Bound parameters.php
rename to manual/codes/Working with objects - Component overview - Query - Bound parameters.php
diff --git a/manual/codes/Working with objects - Component overview - Query - DQL - SQL conversion.php b/manual/codes/Working with objects - Component overview - Query - DQL - SQL conversion.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Query - FROM - selecting tables.php b/manual/codes/Working with objects - Component overview - Query - FROM - selecting tables.php
similarity index 100%
rename from manual/codes/Basic Components - Query - FROM - selecting tables.php
rename to manual/codes/Working with objects - Component overview - Query - FROM - selecting tables.php
diff --git a/manual/codes/Basic Components - Query - Fetching strategies.php b/manual/codes/Working with objects - Component overview - Query - Fetching strategies.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Fetching strategies.php
rename to manual/codes/Working with objects - Component overview - Query - Fetching strategies.php
diff --git a/manual/codes/Working with objects - Component overview - Query - HAVING conditions.php b/manual/codes/Working with objects - Component overview - Query - HAVING conditions.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Query - Introduction.php b/manual/codes/Working with objects - Component overview - Query - Introduction.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Introduction.php
rename to manual/codes/Working with objects - Component overview - Query - Introduction.php
diff --git a/manual/codes/Basic Components - Query - LIMIT and OFFSET - limiting the query results.php b/manual/codes/Working with objects - Component overview - Query - LIMIT and OFFSET - limiting the query results.php
similarity index 100%
rename from manual/codes/Basic Components - Query - LIMIT and OFFSET - limiting the query results.php
rename to manual/codes/Working with objects - Component overview - Query - LIMIT and OFFSET - limiting the query results.php
diff --git a/manual/codes/Basic Components - Query - Lazy property fetching.php b/manual/codes/Working with objects - Component overview - Query - Lazy property fetching.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Lazy property fetching.php
rename to manual/codes/Working with objects - Component overview - Query - Lazy property fetching.php
diff --git a/manual/codes/Basic Components - Query - Method overloading.php b/manual/codes/Working with objects - Component overview - Query - Method overloading.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Method overloading.php
rename to manual/codes/Working with objects - Component overview - Query - Method overloading.php
diff --git a/manual/codes/Basic Components - Query - ORDER BY - sorting query results.php b/manual/codes/Working with objects - Component overview - Query - ORDER BY - sorting query results.php
similarity index 100%
rename from manual/codes/Basic Components - Query - ORDER BY - sorting query results.php
rename to manual/codes/Working with objects - Component overview - Query - ORDER BY - sorting query results.php
diff --git a/manual/codes/Basic Components - Query - Relation operators.php b/manual/codes/Working with objects - Component overview - Query - Relation operators.php
similarity index 100%
rename from manual/codes/Basic Components - Query - Relation operators.php
rename to manual/codes/Working with objects - Component overview - Query - Relation operators.php
diff --git a/manual/codes/Basic Components - Query - WHERE - setting query conditions.php b/manual/codes/Working with objects - Component overview - Query - WHERE - setting query conditions.php
similarity index 100%
rename from manual/codes/Basic Components - Query - WHERE - setting query conditions.php
rename to manual/codes/Working with objects - Component overview - Query - WHERE - setting query conditions.php
diff --git a/manual/codes/Basic Components - RawSql - Adding components.php b/manual/codes/Working with objects - Component overview - RawSql - Adding components.php
similarity index 100%
rename from manual/codes/Basic Components - RawSql - Adding components.php
rename to manual/codes/Working with objects - Component overview - RawSql - Adding components.php
diff --git a/manual/codes/Working with objects - Component overview - RawSql - Introduction.php b/manual/codes/Working with objects - Component overview - RawSql - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - RawSql - Method overloading.php b/manual/codes/Working with objects - Component overview - RawSql - Method overloading.php
similarity index 100%
rename from manual/codes/Basic Components - RawSql - Method overloading.php
rename to manual/codes/Working with objects - Component overview - RawSql - Method overloading.php
diff --git a/manual/codes/Basic Components - RawSql - Using SQL.php b/manual/codes/Working with objects - Component overview - RawSql - Using SQL.php
similarity index 100%
rename from manual/codes/Basic Components - RawSql - Using SQL.php
rename to manual/codes/Working with objects - Component overview - RawSql - Using SQL.php
diff --git a/manual/codes/Basic Components - Record - Accessing properties.php b/manual/codes/Working with objects - Component overview - Record - Accessing properties.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Accessing properties.php
rename to manual/codes/Working with objects - Component overview - Record - Accessing properties.php
diff --git a/manual/codes/Working with objects - Component overview - Record - Callbacks.php b/manual/codes/Working with objects - Component overview - Record - Callbacks.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Record - Checking existence.php b/manual/codes/Working with objects - Component overview - Record - Checking existence.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Checking existence.php
rename to manual/codes/Working with objects - Component overview - Record - Checking existence.php
diff --git a/manual/codes/Basic Components - Record - Creating new records.php b/manual/codes/Working with objects - Component overview - Record - Creating new records.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Creating new records.php
rename to manual/codes/Working with objects - Component overview - Record - Creating new records.php
diff --git a/manual/codes/Basic Components - Record - Deleting records.php b/manual/codes/Working with objects - Component overview - Record - Deleting records.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Deleting records.php
rename to manual/codes/Working with objects - Component overview - Record - Deleting records.php
diff --git a/manual/codes/Basic Components - Record - Getting object copy.php b/manual/codes/Working with objects - Component overview - Record - Getting object copy.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Getting object copy.php
rename to manual/codes/Working with objects - Component overview - Record - Getting object copy.php
diff --git a/manual/codes/Basic Components - Record - Getting record state.php b/manual/codes/Working with objects - Component overview - Record - Getting record state.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Getting record state.php
rename to manual/codes/Working with objects - Component overview - Record - Getting record state.php
diff --git a/manual/codes/Working with objects - Component overview - Record - Introduction.php b/manual/codes/Working with objects - Component overview - Record - Introduction.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Record - Retrieving existing records.php b/manual/codes/Working with objects - Component overview - Record - Retrieving existing records.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Retrieving existing records.php
rename to manual/codes/Working with objects - Component overview - Record - Retrieving existing records.php
diff --git a/manual/codes/Basic Components - Record - Serializing.php b/manual/codes/Working with objects - Component overview - Record - Serializing.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Serializing.php
rename to manual/codes/Working with objects - Component overview - Record - Serializing.php
diff --git a/manual/codes/Basic Components - Record - Updating records.php b/manual/codes/Working with objects - Component overview - Record - Updating records.php
similarity index 100%
rename from manual/codes/Basic Components - Record - Updating records.php
rename to manual/codes/Working with objects - Component overview - Record - Updating records.php
diff --git a/manual/codes/Basic Components - Table - Custom finders.php b/manual/codes/Working with objects - Component overview - Table - Custom finders.php
similarity index 100%
rename from manual/codes/Basic Components - Table - Custom finders.php
rename to manual/codes/Working with objects - Component overview - Table - Custom finders.php
diff --git a/manual/codes/Basic Components - Table - Custom table classes.php b/manual/codes/Working with objects - Component overview - Table - Custom table classes.php
similarity index 100%
rename from manual/codes/Basic Components - Table - Custom table classes.php
rename to manual/codes/Working with objects - Component overview - Table - Custom table classes.php
diff --git a/manual/codes/Basic Components - Table - Finder methods.php b/manual/codes/Working with objects - Component overview - Table - Finder methods.php
similarity index 100%
rename from manual/codes/Basic Components - Table - Finder methods.php
rename to manual/codes/Working with objects - Component overview - Table - Finder methods.php
diff --git a/manual/codes/Working with objects - Component overview - Table - Getting relation objects.php b/manual/codes/Working with objects - Component overview - Table - Getting relation objects.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Basic Components - Table - Getting table information.php b/manual/codes/Working with objects - Component overview - Table - Getting table information.php
similarity index 100%
rename from manual/codes/Basic Components - Table - Getting table information.php
rename to manual/codes/Working with objects - Component overview - Table - Getting table information.php
diff --git a/manual/codes/Working with objects - Component overview - Table - Introduction.php b/manual/codes/Working with objects - Component overview - Table - Introduction.php
new file mode 100644
index 000000000..e69de29bb