diff --git a/src/NadekoBot/Modules/Searches/Commands/ConverterCommands.cs b/src/NadekoBot/Modules/Searches/Commands/ConverterCommands.cs
index c8312d49..aad8a0d1 100644
--- a/src/NadekoBot/Modules/Searches/Commands/ConverterCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Commands/ConverterCommands.cs
@@ -7,6 +7,7 @@
 //using System.Threading;
 //using System.Threading.Tasks;
 
+//todo Unit Conversion lib
 //namespace NadekoBot.Modules.Searches.Commands
 //{
 //    class ConverterCommand : DiscordCommand
diff --git a/src/NadekoBot/Modules/Searches/Commands/EvalCommand.cs b/src/NadekoBot/Modules/Searches/Commands/EvalCommand.cs
index 1cb47d9d..9a58a312 100644
--- a/src/NadekoBot/Modules/Searches/Commands/EvalCommand.cs
+++ b/src/NadekoBot/Modules/Searches/Commands/EvalCommand.cs
@@ -5,6 +5,7 @@
 //using System.Text.RegularExpressions;
 //using System.Threading.Tasks;
 
+//todo mathos parser replacement
 //namespace NadekoBot.Modules.Searches.Commands
 //{
 //    class CalcCommand : DiscordCommand
diff --git a/src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs b/src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
index 3e209f88..12b5dae6 100644
--- a/src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
+++ b/src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
@@ -1,4 +1,5 @@
-using System;
+using NadekoBot.Modules.Searches.Commands.Models;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs b/src/NadekoBot/Modules/Searches/Commands/Models/ImdbMovie.cs
similarity index 95%
rename from src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
rename to src/NadekoBot/Modules/Searches/Commands/Models/ImdbMovie.cs
index 5fa29fb4..56bbc890 100644
--- a/src/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
+++ b/src/NadekoBot/Modules/Searches/Commands/Models/ImdbMovie.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Net;
 
-namespace NadekoBot.Modules.Searches.Commands.IMDB
+namespace NadekoBot.Modules.Searches.Commands.Models
 {
     public class ImdbMovie
     {
diff --git a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs
index e676ce43..238c9edd 100644
--- a/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Commands/OsuCommands.cs
@@ -6,6 +6,7 @@
 //using System.Net;
 //using System.Text.RegularExpressions;
 
+//todo DI into partials
 //namespace NadekoBot.Modules.Searches.Commands
 //{
 //    internal class OsuCommands : DiscordCommand
diff --git a/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs b/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs
index 4a0d423b..472da870 100644
--- a/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs
+++ b/src/NadekoBot/Modules/Searches/Commands/StreamNotificationCommands.cs
@@ -9,6 +9,7 @@
 //using NadekoBot.Services;
 //using System.Threading;
 
+//todo DB
 //namespace NadekoBot.Modules.Searches.Commands
 //{
 //    public partial class SearchesModule : DiscordModule