diff --git a/src/Makefile.am b/src/Makefile.am
index 6efc7546..50dff021 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,9 @@ liblolcore_headers = \
 
 liblolcore_sources = \
     application/application.cpp application/application.h \
-    application/baselua.cpp application/baselua.h \
+    \
+    lolua/baselua.cpp lolua/baselua.h \
+    \
     eglapp.cpp eglapp.h \
     \
     commandstack.h \
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index 2cab3865..11eb2ae5 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -88,7 +88,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="application\application.cpp" />
-    <ClCompile Include="application\baselua.cpp" />
     <ClCompile Include="audio.cpp" />
     <ClCompile Include="camera.cpp" />
     <ClCompile Include="base\assert.cpp" />
@@ -156,6 +155,7 @@
     <ClCompile Include="input\controller.cpp" />
     <ClCompile Include="input\input.cpp" />
     <ClCompile Include="light.cpp" />
+    <ClCompile Include="lolua\baselua.cpp" />
     <ClCompile Include="math\constants.cpp" />
     <ClCompile Include="math\geometry.cpp" />
     <ClCompile Include="math\half.cpp" />
@@ -233,7 +233,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application\application.h" />
-    <ClInclude Include="application\baselua.h" />
     <ClInclude Include="audio.h" />
     <ClInclude Include="camera.h" />
     <ClInclude Include="commandstack.h" />
@@ -260,6 +259,7 @@
     <ClInclude Include="light.h" />
     <ClInclude Include="loldebug.h" />
     <ClInclude Include="lolgl.h" />
+    <ClInclude Include="lolua\baselua.h" />
     <ClInclude Include="lol\algorithm\aabb_tree.h" />
     <ClInclude Include="lol\algorithm\all.h" />
     <ClInclude Include="lol\algorithm\portal.h" />
diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
index 57fd0dfb..57917708 100644
--- a/src/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -88,7 +88,7 @@
     <Filter Include="image\filter">
       <UniqueIdentifier>{3f420a7d-0538-463a-925b-3f8968bf628e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="lua">
+    <Filter Include="lolua">
       <UniqueIdentifier>{25cc0513-ad71-4fbe-bd24-acc88aa66833}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -409,8 +409,8 @@
     <ClCompile Include="easymesh\easymeshlua.cpp">
       <Filter>easymesh</Filter>
     </ClCompile>
-    <ClCompile Include="application\baselua.cpp">
-      <Filter>lua</Filter>
+    <ClCompile Include="lolua\baselua.cpp">
+      <Filter>lolua</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -766,8 +766,8 @@
     <ClInclude Include="easymesh\easymeshlua.h">
       <Filter>easymesh</Filter>
     </ClInclude>
-    <ClInclude Include="application\baselua.h">
-      <Filter>lua</Filter>
+    <ClInclude Include="lolua\baselua.h">
+      <Filter>lolua</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/application/baselua.cpp b/src/lolua/baselua.cpp
similarity index 100%
rename from src/application/baselua.cpp
rename to src/lolua/baselua.cpp
diff --git a/src/application/baselua.h b/src/lolua/baselua.h
similarity index 100%
rename from src/application/baselua.h
rename to src/lolua/baselua.h