diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcbaeaf..3e4576c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.0)
 include_directories(.)
 add_definitions("-std=c++1y")
 
-add_executable(peglint lint/peglint.cc)
+add_executable(peglint lint/cmdline/peglint.cc)
 target_link_libraries(peglint pthread)
 
-add_executable(playground lint/playground/main.cc)
+add_executable(playground lint/online/main.cc)
 target_link_libraries(playground pthread)
 
 add_executable(test-main test/test.cc)
diff --git a/lint/Makefile b/lint/cmdline/Makefile
similarity index 78%
rename from lint/Makefile
rename to lint/cmdline/Makefile
index 89c058b..4ddb46e 100644
--- a/lint/Makefile
+++ b/lint/cmdline/Makefile
@@ -12,4 +12,4 @@ endif
 all: peglint
 
 peglint : peglint.cc ../peglib.h
-	$(CC) -o peglint $(CFLAGS) -I.. peglint.cc
+	$(CC) -o peglint $(CFLAGS) -I../.. peglint.cc
diff --git a/lint/peglint.cc b/lint/cmdline/peglint.cc
similarity index 100%
rename from lint/peglint.cc
rename to lint/cmdline/peglint.cc
diff --git a/lint/peglint.sln b/lint/cmdline/peglint.sln
similarity index 100%
rename from lint/peglint.sln
rename to lint/cmdline/peglint.sln
diff --git a/lint/peglint.vcxproj b/lint/cmdline/peglint.vcxproj
similarity index 96%
rename from lint/peglint.vcxproj
rename to lint/cmdline/peglint.vcxproj
index 2b73107..6d9586a 100644
--- a/lint/peglint.vcxproj
+++ b/lint/cmdline/peglint.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\peglib.h" />
+    <ClInclude Include="..\..\peglib.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="peglint.cc" />
@@ -88,4 +88,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lint/playground/httplib.h b/lint/online/httplib.h
similarity index 100%
rename from lint/playground/httplib.h
rename to lint/online/httplib.h
diff --git a/lint/playground/main.cc b/lint/online/main.cc
similarity index 100%
rename from lint/playground/main.cc
rename to lint/online/main.cc
diff --git a/lint/playground/playground.sln b/lint/online/playground.sln
similarity index 100%
rename from lint/playground/playground.sln
rename to lint/online/playground.sln
diff --git a/lint/playground/playground.vcxproj b/lint/online/playground.vcxproj
similarity index 100%
rename from lint/playground/playground.vcxproj
rename to lint/online/playground.vcxproj
diff --git a/lint/playground/www/index.html b/lint/online/www/index.html
similarity index 100%
rename from lint/playground/www/index.html
rename to lint/online/www/index.html