diff --git a/index.html b/index.html
index de706fa..20f9a38 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
- Doctrine ORM is Webscale
+ Doctrine - Best pratices series
diff --git a/slides/application-example/bad-example/contract-controller-stamp.html b/slides/application-example/bad-example/contract-controller-stamp.html
deleted file mode 100644
index 861e744..0000000
--- a/slides/application-example/bad-example/contract-controller-stamp.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-class ContractController {
- public function putAction()
- {
- // validation
-
- $contract = $this->contracts->find($data['id']);
-
- // update the contract with data
-
- $this->contractService->save($contract);
-
- return $renderTemplate($contract);
- }
-}
-
-
-
diff --git a/slides/application-example/bad-example/contract-controller.html b/slides/application-example/bad-example/contract-controller.html
deleted file mode 100644
index 963b757..0000000
--- a/slides/application-example/bad-example/contract-controller.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-class ContractController {
- public function putAction()
- {
- // validation
-
- $contract = $this->contracts->find($data['id']);
-
- // update the contract with data
-
- $this->contractService->save($contract);
-
- return $renderTemplate($contract);
- }
-}
-
diff --git a/slides/application-example/bad-example/creating-an-invoice-is-not-about-saving-it.html b/slides/application-example/bad-example/creating-an-invoice-is-not-about-saving-it.html
deleted file mode 100644
index 795e2f3..0000000
--- a/slides/application-example/bad-example/creating-an-invoice-is-not-about-saving-it.html
+++ /dev/null
@@ -1 +0,0 @@
-Creating an invoice is not about "saving" it
diff --git a/slides/application-example/bad-example/invoice-controller.html b/slides/application-example/bad-example/invoice-controller.html
deleted file mode 100644
index cac72e4..0000000
--- a/slides/application-example/bad-example/invoice-controller.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-class InvoiceController {
- public function postAction()
- {
- // validation
-
- $invoice = new Invoice();
-
- // fill the invoice with data
-
- $this->invoiceService->save($invoice);
-
- return $renderTemplate($invoice);
- }
-}
-
-
-* deliberately bad example
\ No newline at end of file
diff --git a/slides/application-example/bad-example/terminating-a-contract-is-not-the-same-as-updating-it.html b/slides/application-example/bad-example/terminating-a-contract-is-not-the-same-as-updating-it.html
deleted file mode 100644
index 714fab8..0000000
--- a/slides/application-example/bad-example/terminating-a-contract-is-not-the-same-as-updating-it.html
+++ /dev/null
@@ -1 +0,0 @@
-terminating a contract is not the same as updating it
\ No newline at end of file
diff --git a/slides/application-example/we-started-building-behavior-around-state.html b/slides/application-example/we-started-building-behavior-around-state.html
deleted file mode 100644
index 449515b..0000000
--- a/slides/application-example/we-started-building-behavior-around-state.html
+++ /dev/null
@@ -1 +0,0 @@
-We started building behavior around state
\ No newline at end of file
diff --git a/slides/application-example/why-you-ask.html b/slides/application-example/why-you-ask.html
deleted file mode 100644
index 8204d80..0000000
--- a/slides/application-example/why-you-ask.html
+++ /dev/null
@@ -1 +0,0 @@
-Why, you ask?
\ No newline at end of file
diff --git a/slides/applications-suck/applications-suck.html b/slides/applications-suck/applications-suck.html
deleted file mode 100644
index a0b88b9..0000000
--- a/slides/applications-suck/applications-suck.html
+++ /dev/null
@@ -1 +0,0 @@
-Our applications suck
\ No newline at end of file
diff --git a/slides/applications-suck/crud/crud-is-horrible.html b/slides/applications-suck/crud/crud-is-horrible.html
deleted file mode 100644
index 7bffdb7..0000000
--- a/slides/applications-suck/crud/crud-is-horrible.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/slides/applications-suck/crud/crud.html b/slides/applications-suck/crud/crud.html
deleted file mode 100644
index b28ff82..0000000
--- a/slides/applications-suck/crud/crud.html
+++ /dev/null
@@ -1 +0,0 @@
-CRUD
\ No newline at end of file
diff --git a/slides/applications-suck/crud/we-build-massive-piles-of.html b/slides/applications-suck/crud/we-build-massive-piles-of.html
deleted file mode 100644
index 6d5073a..0000000
--- a/slides/applications-suck/crud/we-build-massive-piles-of.html
+++ /dev/null
@@ -1 +0,0 @@
-We build massive piles of...
\ No newline at end of file
diff --git a/slides/applications-suck/let-s-talk-about-something-important.html b/slides/applications-suck/let-s-talk-about-something-important.html
deleted file mode 100644
index b96a956..0000000
--- a/slides/applications-suck/let-s-talk-about-something-important.html
+++ /dev/null
@@ -1 +0,0 @@
-Something important instead:
\ No newline at end of file
diff --git a/slides/applications-suck/our-applications-suck/applications.html b/slides/applications-suck/our-applications-suck/applications.html
deleted file mode 100644
index 62c6b2e..0000000
--- a/slides/applications-suck/our-applications-suck/applications.html
+++ /dev/null
@@ -1 +0,0 @@
-Applications
\ No newline at end of file
diff --git a/slides/applications-suck/our-applications-suck/our.html b/slides/applications-suck/our-applications-suck/our.html
deleted file mode 100644
index a397974..0000000
--- a/slides/applications-suck/our-applications-suck/our.html
+++ /dev/null
@@ -1 +0,0 @@
-Our
\ No newline at end of file
diff --git a/slides/applications-suck/our-applications-suck/suck.html b/slides/applications-suck/our-applications-suck/suck.html
deleted file mode 100644
index 57b0c78..0000000
--- a/slides/applications-suck/our-applications-suck/suck.html
+++ /dev/null
@@ -1 +0,0 @@
-Suck
\ No newline at end of file
diff --git a/slides/basic-cqrs/crud-vs-command.html b/slides/basic-cqrs/crud-vs-command.html
deleted file mode 100644
index 9593514..0000000
--- a/slides/basic-cqrs/crud-vs-command.html
+++ /dev/null
@@ -1 +0,0 @@
-CRUD vs CQRS
diff --git a/slides/basic-cqrs/intro.html b/slides/basic-cqrs/intro.html
deleted file mode 100644
index 3945155..0000000
--- a/slides/basic-cqrs/intro.html
+++ /dev/null
@@ -1 +0,0 @@
-CQRS!
diff --git a/slides/basic-cqrs/why-cqrs.html b/slides/basic-cqrs/why-cqrs.html
deleted file mode 100644
index 734045c..0000000
--- a/slides/basic-cqrs/why-cqrs.html
+++ /dev/null
@@ -1 +0,0 @@
-Why CQRS!?
diff --git a/slides/basic-cqrs/workflow/command-handle.html b/slides/basic-cqrs/workflow/command-handle.html
deleted file mode 100644
index 0c74b40..0000000
--- a/slides/basic-cqrs/workflow/command-handle.html
+++ /dev/null
@@ -1,2 +0,0 @@
-Command Handler
-Do something! (Yeah)
diff --git a/slides/basic-cqrs/workflow/command.html b/slides/basic-cqrs/workflow/command.html
deleted file mode 100644
index 31520f6..0000000
--- a/slides/basic-cqrs/workflow/command.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Commands
-
-
- - Do something! (But not)
-
diff --git a/slides/basic-cqrs/workflow/commandbus.html b/slides/basic-cqrs/workflow/commandbus.html
deleted file mode 100644
index cc64d31..0000000
--- a/slides/basic-cqrs/workflow/commandbus.html
+++ /dev/null
@@ -1 +0,0 @@
-Command Bus
diff --git a/slides/basic-cqrs/workflow/example/command-handle.html b/slides/basic-cqrs/workflow/example/command-handle.html
deleted file mode 100644
index 3d5750f..0000000
--- a/slides/basic-cqrs/workflow/example/command-handle.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
- // Commands + Command Handler Example
-
- $hanlder = new HandlerRegisterUser(
- new RegisterUser('ocramius')
- );
diff --git a/slides/basic-cqrs/workflow/example/command.html b/slides/basic-cqrs/workflow/example/command.html
deleted file mode 100644
index f5f08d1..0000000
--- a/slides/basic-cqrs/workflow/example/command.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
- // Commands Example
-
- new RegisterUser('ocramius');
- new RemoveUser('ocramius');
- new RestoreUser('ocramius');
diff --git a/slides/basic-cqrs/workflow/example/commandbus.html b/slides/basic-cqrs/workflow/example/commandbus.html
deleted file mode 100644
index a346849..0000000
--- a/slides/basic-cqrs/workflow/example/commandbus.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
- // CommandsBus + Commands + Command Handlers Example
-
- $handlers = [RegisterUser::class => HandlerRegisterUser::class];
-
- $commandBus = new CommandBus($handlers);
-
- $commandBus->push(new RegisterUser('ocramius'));
diff --git a/slides/basic-cqrs/workflow/note/command-handle.html b/slides/basic-cqrs/workflow/note/command-handle.html
deleted file mode 100644
index 6f3ab70..0000000
--- a/slides/basic-cqrs/workflow/note/command-handle.html
+++ /dev/null
@@ -1 +0,0 @@
-Manual Thing :(
diff --git a/slides/basic-cqrs/workflow/note/command.html b/slides/basic-cqrs/workflow/note/command.html
deleted file mode 100644
index f61d4ea..0000000
--- a/slides/basic-cqrs/workflow/note/command.html
+++ /dev/null
@@ -1,6 +0,0 @@
-How commands look like?
-
-
-
-POPO
-VO's
diff --git a/slides/basic-cqrs/workflow/note/commandbus.html b/slides/basic-cqrs/workflow/note/commandbus.html
deleted file mode 100644
index db92919..0000000
--- a/slides/basic-cqrs/workflow/note/commandbus.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/slides/basic-cqrs/workflow/what-we-need.html b/slides/basic-cqrs/workflow/what-we-need.html
deleted file mode 100644
index ef691a7..0000000
--- a/slides/basic-cqrs/workflow/what-we-need.html
+++ /dev/null
@@ -1,7 +0,0 @@
-What we need?
-
-
- - Command
- - Command Handler
- - Command Bus
-
diff --git a/slides/command-bus/command-bus-executes.html b/slides/command-bus/command-bus-executes.html
deleted file mode 100644
index a838cd1..0000000
--- a/slides/command-bus/command-bus-executes.html
+++ /dev/null
@@ -1 +0,0 @@
-$commandBus($command);
\ No newline at end of file
diff --git a/slides/command-bus/command-bus.html b/slides/command-bus/command-bus.html
deleted file mode 100644
index bd9ed89..0000000
--- a/slides/command-bus/command-bus.html
+++ /dev/null
@@ -1 +0,0 @@
-Command Bus
\ No newline at end of file
diff --git a/slides/command-bus/who-executes-commands.html b/slides/command-bus/who-executes-commands.html
deleted file mode 100644
index 7861448..0000000
--- a/slides/command-bus/who-executes-commands.html
+++ /dev/null
@@ -1 +0,0 @@
-Who executes commands?
\ No newline at end of file
diff --git a/slides/commands/commands-are-simple.html b/slides/commands/commands-are-simple.html
deleted file mode 100644
index 1c8d461..0000000
--- a/slides/commands/commands-are-simple.html
+++ /dev/null
@@ -1 +0,0 @@
-Commands are simple
\ No newline at end of file
diff --git a/slides/commands/commands-are-value-objects.html b/slides/commands/commands-are-value-objects.html
deleted file mode 100644
index 3371230..0000000
--- a/slides/commands/commands-are-value-objects.html
+++ /dev/null
@@ -1 +0,0 @@
-Commands are value objects
\ No newline at end of file
diff --git a/slides/commands/commands-express-intent.html b/slides/commands/commands-express-intent.html
deleted file mode 100644
index d663ffe..0000000
--- a/slides/commands/commands-express-intent.html
+++ /dev/null
@@ -1 +0,0 @@
-Commands express intent
\ No newline at end of file
diff --git a/slides/commands/commands.html b/slides/commands/commands.html
deleted file mode 100644
index 0d30d37..0000000
--- a/slides/commands/commands.html
+++ /dev/null
@@ -1 +0,0 @@
-Commands
\ No newline at end of file
diff --git a/slides/commands/examples/create-an-invoice.html b/slides/commands/examples/create-an-invoice.html
deleted file mode 100644
index ac162fd..0000000
--- a/slides/commands/examples/create-an-invoice.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$command = new CreateInvoice($customerId, $lineItemIds);
-
-execute($command);
-
diff --git a/slides/commands/examples/give-me-a-beer.html b/slides/commands/examples/give-me-a-beer.html
deleted file mode 100644
index f94a0c3..0000000
--- a/slides/commands/examples/give-me-a-beer.html
+++ /dev/null
@@ -1 +0,0 @@
-execute(new Accio('Beer'));
diff --git a/slides/commands/examples/make-me-a-sandwich.html b/slides/commands/examples/make-me-a-sandwich.html
deleted file mode 100644
index a60921a..0000000
--- a/slides/commands/examples/make-me-a-sandwich.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/slides/cqrs/command-query-responsibility-segregation.html b/slides/cqrs/command-query-responsibility-segregation.html
deleted file mode 100644
index c908dbe..0000000
--- a/slides/cqrs/command-query-responsibility-segregation.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
- Command
-
- Query
-
- Responsibility
-
- Segregation
-
\ No newline at end of file
diff --git a/slides/cqrs/cqrs.html b/slides/cqrs/cqrs.html
deleted file mode 100644
index 4cabec8..0000000
--- a/slides/cqrs/cqrs.html
+++ /dev/null
@@ -1 +0,0 @@
-CQRS
\ No newline at end of file
diff --git a/slides/cqrs/example/contract-command-handler.html b/slides/cqrs/example/contract-command-handler.html
deleted file mode 100644
index e2ae7e3..0000000
--- a/slides/cqrs/example/contract-command-handler.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-$commandHandler = function (TerminateContract $terminate) use (...) {
- $contract = $contracts->find($terminate->contractId);
-
- $contract->terminate();
-
- $save($contract);
-
- $commandBus(new SendCancellationNotifications($contract->id));
-};
-
\ No newline at end of file
diff --git a/slides/cqrs/example/contract-controller.html b/slides/cqrs/example/contract-controller.html
deleted file mode 100644
index 6f0f67f..0000000
--- a/slides/cqrs/example/contract-controller.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-class ContractController {
- public function terminateContractAction()
- {
- // just do it!
- $commandBus(new TerminateContract($data['id']));
-
- return $renderTemplate($contracts->findById($contractId));
- }
-}
-
\ No newline at end of file
diff --git a/slides/final-classes/final-classes.html b/slides/final-classes/final-classes.html
deleted file mode 100644
index e94890e..0000000
--- a/slides/final-classes/final-classes.html
+++ /dev/null
@@ -1 +0,0 @@
-Final Classes
\ No newline at end of file
diff --git a/slides/final-classes/i-am-not-talking-about-it.html b/slides/final-classes/i-am-not-talking-about-it.html
deleted file mode 100644
index d537e6e..0000000
--- a/slides/final-classes/i-am-not-talking-about-it.html
+++ /dev/null
@@ -1 +0,0 @@
-I will not talk about it
diff --git a/slides/final-classes/read-it.html b/slides/final-classes/read-it.html
deleted file mode 100644
index 9a9fab5..0000000
--- a/slides/final-classes/read-it.html
+++ /dev/null
@@ -1 +0,0 @@
-Read it!
diff --git a/slides/final-classes/there-is-a-blogpost.html b/slides/final-classes/there-is-a-blogpost.html
deleted file mode 100644
index c1bf45a..0000000
--- a/slides/final-classes/there-is-a-blogpost.html
+++ /dev/null
@@ -1,3 +0,0 @@
-There is a blogpost:
-
-http://bit.do/final-classes
diff --git a/slides/intent/how-do-we-code-intent.html b/slides/intent/how-do-we-code-intent.html
deleted file mode 100644
index 22a8cb7..0000000
--- a/slides/intent/how-do-we-code-intent.html
+++ /dev/null
@@ -1 +0,0 @@
-How do we code intent?
\ No newline at end of file
diff --git a/slides/intent/intent.html b/slides/intent/intent.html
deleted file mode 100644
index 6fc7888..0000000
--- a/slides/intent/intent.html
+++ /dev/null
@@ -1 +0,0 @@
-Intent
\ No newline at end of file
diff --git a/slides/intent/our-code-does-not-express.html b/slides/intent/our-code-does-not-express.html
deleted file mode 100644
index 11c7d99..0000000
--- a/slides/intent/our-code-does-not-express.html
+++ /dev/null
@@ -1 +0,0 @@
-Our code does not express...
\ No newline at end of file
diff --git a/slides/introduction/kittens.html b/slides/introduction/intro.html
similarity index 100%
rename from slides/introduction/kittens.html
rename to slides/introduction/intro.html
diff --git a/slides/list.json b/slides/list.json
index 92c5e6f..1757bb1 100644
--- a/slides/list.json
+++ b/slides/list.json
@@ -1,74 +1,8 @@
[
- "introduction/kittens.html",
+ "introduction/intro.html",
"introduction/i-am-marco.html",
"introduction/i-work-for.html",
- "final-classes/final-classes.html",
- "final-classes/there-is-a-blogpost.html",
- "final-classes/read-it.html",
- "final-classes/i-am-not-talking-about-it.html",
-
- "applications-suck/let-s-talk-about-something-important.html",
- "applications-suck/our-applications-suck/our.html",
- "applications-suck/our-applications-suck/applications.html",
- "applications-suck/our-applications-suck/suck.html",
-
- "applications-suck/crud/we-build-massive-piles-of.html",
- "applications-suck/crud/crud.html",
- "applications-suck/crud/crud-is-horrible.html",
-
- "application-example/why-you-ask.html",
- "application-example/we-started-building-behavior-around-state.html",
- "application-example/bad-example/invoice-controller.html",
- "application-example/bad-example/creating-an-invoice-is-not-about-saving-it.html",
- "application-example/bad-example/contract-controller.html",
- "application-example/bad-example/contract-controller-stamp.html",
- "application-example/bad-example/terminating-a-contract-is-not-the-same-as-updating-it.html",
-
- "intent/our-code-does-not-express.html",
- "intent/intent.html",
- "intent/how-do-we-code-intent.html",
-
- "commands/commands.html",
- "commands/examples/create-an-invoice.html",
- "commands/examples/give-me-a-beer.html",
- "commands/examples/make-me-a-sandwich.html",
- "commands/commands-express-intent.html",
- "commands/commands-are-simple.html",
- "commands/commands-are-value-objects.html",
-
- "command-bus/who-executes-commands.html",
- "command-bus/command-bus.html",
- "command-bus/command-bus-executes.html",
-
- "read-model/who-gives-us-the-data.html",
- "read-model/read-model.html",
- "read-model/read-model-read.html",
-
- "cqrs/cqrs.html",
- "cqrs/command-query-responsibility-segregation.html",
- "cqrs/example/contract-controller.html",
- "cqrs/example/contract-command-handler.html",
-
- "more/cqrs-has-more.html",
- "more/i-like-the-explicit-intent.html",
-
- "basic-cqrs/intro.html",
- "basic-cqrs/why-cqrs.html",
- "basic-cqrs/workflow/what-we-need.html",
- "basic-cqrs/workflow/command.html",
- "basic-cqrs/workflow/example/command.html",
- "basic-cqrs/workflow/note/command.html",
- "basic-cqrs/workflow/command-handle.html",
- "basic-cqrs/workflow/example/command-handle.html",
- "basic-cqrs/workflow/note/command-handle.html",
- "basic-cqrs/workflow/commandbus.html",
- "basic-cqrs/workflow/example/commandbus.html",
- "basic-cqrs/workflow/note/commandbus.html",
- "basic-cqrs/crud-vs-command.html",
-
- "shittycqrs/intro.html",
- "shittycqrs/show-me-the-code.html",
-
+ "doctrine/beginer.html",
"outro/thanks.html"
]
diff --git a/slides/more/cqrs-has-more.html b/slides/more/cqrs-has-more.html
deleted file mode 100644
index 7a0b0e0..0000000
--- a/slides/more/cqrs-has-more.html
+++ /dev/null
@@ -1 +0,0 @@
-CQRS has many advantages...
\ No newline at end of file
diff --git a/slides/more/i-like-the-explicit-intent.html b/slides/more/i-like-the-explicit-intent.html
deleted file mode 100644
index 813e31d..0000000
--- a/slides/more/i-like-the-explicit-intent.html
+++ /dev/null
@@ -1 +0,0 @@
-...I like the explicit intent
\ No newline at end of file
diff --git a/slides/read-model/read-model-read.html b/slides/read-model/read-model-read.html
deleted file mode 100644
index 905ed1b..0000000
--- a/slides/read-model/read-model-read.html
+++ /dev/null
@@ -1 +0,0 @@
-$invoicesArchive->read($invoiceNumber);
\ No newline at end of file
diff --git a/slides/read-model/read-model.html b/slides/read-model/read-model.html
deleted file mode 100644
index 662946d..0000000
--- a/slides/read-model/read-model.html
+++ /dev/null
@@ -1 +0,0 @@
-Read Model
\ No newline at end of file
diff --git a/slides/read-model/who-gives-us-the-data.html b/slides/read-model/who-gives-us-the-data.html
deleted file mode 100644
index fabc88e..0000000
--- a/slides/read-model/who-gives-us-the-data.html
+++ /dev/null
@@ -1 +0,0 @@
-Who "returns" the data?
\ No newline at end of file
diff --git a/slides/shittycqrs/intro.html b/slides/shittycqrs/intro.html
deleted file mode 100644
index 325623a..0000000
--- a/slides/shittycqrs/intro.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/slides/shittycqrs/show-me-the-code.html b/slides/shittycqrs/show-me-the-code.html
deleted file mode 100644
index aee6717..0000000
--- a/slides/shittycqrs/show-me-the-code.html
+++ /dev/null
@@ -1 +0,0 @@
-Show me the code running!