diff --git a/IrcD.Net/IrcD.Net.csproj b/IrcD.Net/IrcD.Net.csproj
index 000ce8d..3577a25 100644
--- a/IrcD.Net/IrcD.Net.csproj
+++ b/IrcD.Net/IrcD.Net.csproj
@@ -108,137 +108,18 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Channel\ChannelInfo.cs" />
-    <Compile Include="Channel\ChannelType.cs" />
-    <Compile Include="Channel\NormalChannel.cs" />
-    <Compile Include="Commands\Arguments\CommandArgument.cs" />
-    <Compile Include="Commands\Arguments\InviteArgument.cs" />
-    <Compile Include="Commands\Arguments\JoinArgument.cs" />
-    <Compile Include="Commands\Arguments\KickArgument.cs" />
-    <Compile Include="Commands\Arguments\KillArgument.cs" />
-    <Compile Include="Commands\Arguments\KnockArgument.cs" />
-    <Compile Include="Commands\Arguments\ModeArgument.cs" />
-    <Compile Include="Commands\Arguments\NickArgument.cs" />
-    <Compile Include="Commands\Arguments\NoticeArgument.cs" />
-    <Compile Include="Commands\Arguments\PartArgument.cs" />
-    <Compile Include="Commands\Arguments\PingArgument.cs" />
-    <Compile Include="Commands\Arguments\PongArgument.cs" />
-    <Compile Include="Commands\Arguments\PrivateMessageArgument.cs" />
-    <Compile Include="Commands\Arguments\QuitArgument.cs" />
-    <Compile Include="Commands\Arguments\TopicArgument.cs" />
-    <Compile Include="Commands\Capabilities.cs" />
-    <Compile Include="Core\Utils\CheckRegisteredAttribute.cs" />
-    <Compile Include="Core\Utils\CheckParamCountAttribute.cs" />
-    <Compile Include="Commands\CommandBase.cs" />
-    <Compile Include="Commands\CommandList.cs" />
-    <Compile Include="Commands\Die.cs" />
-    <Compile Include="Commands\Language.cs" />
-    <Compile Include="Commands\Silence.cs" />
-    <Compile Include="Commands\Wallops.cs" />
-    <Compile Include="Commands\UserHost.cs" />
-    <Compile Include="Commands\IsOn.cs" />
-    <Compile Include="Commands\Summon.cs" />
-    <Compile Include="Commands\Restart.cs" />
-    <Compile Include="Commands\WhoWas.cs" />
-    <Compile Include="Commands\Kill.cs" />
-    <Compile Include="Commands\Error.cs" />
-    <Compile Include="Commands\Away.cs" />
-    <Compile Include="Commands\Pong.cs" />
-    <Compile Include="Commands\Rehash.cs" />
-    <Compile Include="Commands\Info.cs" />
-    <Compile Include="Commands\ServiceList.cs" />
-    <Compile Include="Commands\ServiceQuery.cs" />
-    <Compile Include="Commands\Who.cs" />
-    <Compile Include="Commands\WhoIs.cs" />
-    <Compile Include="Commands\Admin.cs" />
-    <Compile Include="Commands\Links.cs" />
-    <Compile Include="Commands\Time.cs" />
-    <Compile Include="Commands\Connect.cs" />
-    <Compile Include="Commands\Trace.cs" />
-    <Compile Include="Commands\Stats.cs" />
-    <Compile Include="Commands\Version.cs" />
-    <Compile Include="Commands\Notice.cs" />
-    <Compile Include="Commands\ListUsers.cs" />
-    <Compile Include="Commands\MessageOfTheDay.cs" />
-    <Compile Include="Commands\PrivateMessage.cs" />
-    <Compile Include="Commands\Kick.cs" />
-    <Compile Include="Commands\Invite.cs" />
-    <Compile Include="Commands\List.cs" />
-    <Compile Include="Commands\Names.cs" />
-    <Compile Include="Commands\Topic.cs" />
-    <Compile Include="Commands\Part.cs" />
-    <Compile Include="Commands\Join.cs" />
-    <Compile Include="Commands\ServerQuit.cs" />
-    <Compile Include="Commands\Quit.cs" />
-    <Compile Include="Commands\Service.cs" />
-    <Compile Include="Commands\Mode.cs" />
-    <Compile Include="Commands\Oper.cs" />
-    <Compile Include="Commands\Nick.cs" />
-    <Compile Include="Commands\Pass.cs" />
-    <Compile Include="Commands\User.cs" />
-    <Compile Include="Commands\Knock.cs" />
-    <Compile Include="Commands\Ping.cs" />
-    <Compile Include="Core\Utils\IrcCaseMapping.cs" />
-    <Compile Include="Core\Utils\IrcMode.cs" />
-    <Compile Include="Core\InfoBase.cs" />
-    <Compile Include="Core\IrcDaemon.cs" />
-    <Compile Include="Modes\ChannelMode.cs" />
-    <Compile Include="Modes\ChannelModeList.cs" />
-    <Compile Include="Modes\ChannelModes\ModeInviteException.cs" />
-    <Compile Include="Modes\ChannelModes\IParameter.cs" />
-    <Compile Include="Modes\ChannelModes\ModeBanException.cs" />
-    <Compile Include="Modes\ChannelModes\ModeBan.cs" />
-    <Compile Include="Modes\ChannelModes\ModeColorless.cs" />
-    <Compile Include="Modes\ChannelModes\ModeInvite.cs" />
-    <Compile Include="Modes\ChannelModes\ModeKey.cs" />
-    <Compile Include="Modes\ChannelModes\ModeLimit.cs" />
-    <Compile Include="Modes\ChannelModes\ModeModerated.cs" />
-    <Compile Include="Modes\ChannelModes\ModeNoExternal.cs" />
-    <Compile Include="Modes\ChannelModes\ModePrivate.cs" />
-    <Compile Include="Modes\ChannelModes\ModeSecret.cs" />
-    <Compile Include="Modes\ChannelModes\ModeTopic.cs" />
-    <Compile Include="Modes\ChannelModes\ModeTranslate.cs" />
-    <Compile Include="Modes\ChannelRanks\ModeAdmin.cs" />
-    <Compile Include="Modes\ChannelRanks\ModeHalfOp.cs" />
-    <Compile Include="Modes\ChannelRanks\ModeNoRank.cs" />
-    <Compile Include="Modes\ChannelRanks\ModeOp.cs" />
-    <Compile Include="Modes\ChannelRanks\ModeOwner.cs" />
-    <Compile Include="Modes\ChannelRanks\ModeVoice.cs" />
-    <Compile Include="Modes\ChannelRank.cs" />
-    <Compile Include="Modes\Mode.cs" />
-    <Compile Include="Modes\ModeFactory.cs" />
-    <Compile Include="Modes\ModeList.cs" />
-    <Compile Include="Modes\RankList.cs" />
-    <Compile Include="Modes\UserMode.cs" />
-    <Compile Include="Modes\UserModeList.cs" />
-    <Compile Include="Modes\UserModes\ModeAway.cs" />
-    <Compile Include="Modes\UserModes\ModeInvisible.cs" />
-    <Compile Include="Modes\UserModes\ModeLocalOperator.cs" />
-    <Compile Include="Modes\UserModes\ModeOperator.cs" />
-    <Compile Include="Modes\UserModes\ModeRestricted.cs" />
-    <Compile Include="Core\Utils\AlreadyCalledException.cs" />
-    <Compile Include="Modes\UserModes\ModeWallops.cs" />
-    <Compile Include="Core\Utils\OperHost.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Core\Utils\RehashEventArgs.cs" />
-    <Compile Include="Core\ServerInfo.cs" />
-    <Compile Include="ServerReplies\ReplyCode.cs" />
-    <Compile Include="Core\ServerOptions.cs" />
-    <Compile Include="ServerReplies\ServerReplies.cs" />
-    <Compile Include="Core\ServerStats.cs" />
-    <Compile Include="Core\UserInfo.cs" />
-    <Compile Include="Channel\UserPerChannelInfo.cs" />
-    <Compile Include="Tools\EnumerableIndex.cs" />
-    <Compile Include="Tools\EnumExtension.cs" />
-    <Compile Include="Tools\EnumDescription.cs" />
-    <Compile Include="Tools\GoogleTranslate.cs" />
-    <Compile Include="Tools\IrcConstants.cs" />
-    <Compile Include="Tools\DateTimeUtils.cs" />
-    <Compile Include="Tools\Enumerable.cs" />
-    <Compile Include="Tools\JSON.cs" />
-    <Compile Include="Tools\Logger.cs" />
-    <Compile Include="Tools\Tuple.cs" />
-    <Compile Include="Tools\WildCard.cs" />
+    <Compile Include="Channel\*.cs" />
+    <Compile Include="Commands\*.cs" />
+    <Compile Include="Commands\Arguments\*.cs" />
+    <Compile Include="Core\*.cs" />
+    <Compile Include="Core\Utils\*.cs" />
+    <Compile Include="Modes\*.cs" />
+    <Compile Include="Modes\ChannelModes\*.cs" />
+    <Compile Include="Modes\ChannelRanks\*.cs" />
+    <Compile Include="Modes\UserModes\*.cs" />
+    <Compile Include="Properties\*.cs" />
+    <Compile Include="ServerReplies\*.cs" />
+    <Compile Include="Tools\*.cs" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
@@ -250,4 +131,4 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>