diff --git a/Program.cs b/Program.cs
index 9eca2bf..d122f69 100644
--- a/Program.cs
+++ b/Program.cs
@@ -2,73 +2,32 @@
 using System.IO;
 using Ninject;
 using Ninject.Extensions.Conventions;
+using Ninject.Modules;
 
 namespace CommandLineTool
 {
+ public class CommandsModule : NinjectModule
+ {
+ public override void Load()
+ {
+ Kernel.Bind(f =>
+ {
+ var commandTypes = f.FromThisAssembly().Select(typeof(ConsoleCommand).IsAssignableFrom);
+ commandTypes.BindAllBaseClasses().Configure(c => c.InSingletonScope());
+ });
+ Kernel.Bind<icommandsexecutor>().To<commandsexecutor>().InSingletonScope();
+ Kernel.Bind<textwriter>().To<promptconsolewriter>()
+ .WhenInjectedInto<consolecommand>().InSingletonScope();
+ Kernel.Bind<textwriter>().To<redtextconsolewriter>()
+ .WhenInjectedInto<commandsexecutor>().InSingletonScope();
+ }
+ }
+
 public class Program
 {
 private static ICommandsExecutor CreateExecutor()
 {
- var container = new StandardKernel();
-
- #region Варианты биндинга CommandExecutor-а
- /*
- container.Bind<icommandsexecutor>().To<commandsexecutor>().InSingletonScope();
- */
-
- /*
- container.Bind<icommandsexecutor>().To<commandsexecutor>()
- .InSingletonScope()
- .WithConstructorArgument((TextWriter)new RedTextConsoleWriter());
- */
-
- /*
- container.Bind<icommandsexecutor>().To<commandsexecutor>()
- .InSingletonScope()
- //"При обращении к аргументу конструктора TextWriter присвой пожалуйста следующий тип"
- .WithConstructorArgument(typeof(TextWriter), c => c.Kernel.Get<redtextconsolewriter>());
- */
-
- // /*
- container.Bind(c => c.FromThisAssembly().SelectAllClasses().BindAllInterfaces());
- // */
- #endregion
-
- #region Варианты биндинга комманд
- /*
- container.Bind<consolecommand>().To<printtimecommand>();
- container.Bind<consolecommand>().To<timercommand>();
- container.Bind<consolecommand>().To<helpcommand>();
- container.Bind<consolecommand>().To<detailedhelpcommand>();
- */
-
- // /*
- container.Bind(c => c.FromThisAssembly().SelectAllClasses().BindAllBaseClasses());
- // */
- #endregion
-
- #region Варианты биндинга TextWriter-ов
- /*
- //Единый TextWriter
- container.Bind<textwriter>().ToConstant(Console.Out);
- */
-
- //TextWriter для консольных команд
- container.Bind<textwriter>().To<promptconsolewriter>()
- .WhenInjectedInto<consolecommand>();
-
- // /*
- //TextWriter для Executor-а
- container.Bind<textwriter>().To<redtextconsolewriter>()
- .WhenInjectedInto<icommandsexecutor>();
- // */
-
- /*
- //Биндинг с использование атрибута Named.
- container.Bind<textwriter>().To<redtextconsolewriter>().Named("error");
- */
- #endregion
-
+ var container = new StandardKernel(new CommandsModule());
 return container.Get<icommandsexecutor>();
 }
 
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9012d92
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+# Пример для лекции про DI-контейнеры
+
+
+Разные этапы внедрения DI-контейнера:
+
+* https://github.com/urfu-code/CommandLineTool/tree/ProceduralCode
+
+* https://github.com/urfu-code/CommandLineTool/tree/DIPCode
+
+* https://github.com/urfu-code/CommandLineTool/tree/ServiceLocatorCode
+
+* https://github.com/urfu-code/CommandLineTool/tree/DIContainerCode
+
+* https://github.com/urfu-code/CommandLineTool
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/urfu-code/CommandLineTool/compare/DIContainerCode...master.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/urfu-code/CommandLineTool/compare/DIContainerCode...master.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>