diff --git a/lime/app/Application.hx b/lime/app/Application.hx
index 11a615773..6eeee0a8d 100644
--- a/lime/app/Application.hx
+++ b/lime/app/Application.hx
@@ -1,19 +1,24 @@
package lime.app;
+import lime.graphics.IRenderEventListener;
+import lime.graphics.Renderer;
+import lime.graphics.RenderEvent;
+import lime.graphics.RenderEventManager;
+import lime.system.System;
import lime.ui.IKeyEventListener;
import lime.ui.IMouseEventListener;
import lime.ui.ITouchEventListener;
import lime.ui.IWindowEventListener;
-import lime.ui.KeyEventManager;
import lime.ui.KeyEvent;
-import lime.ui.MouseEventManager;
+import lime.ui.KeyEventManager;
import lime.ui.MouseEvent;
-import lime.ui.TouchEventManager;
+import lime.ui.MouseEventManager;
import lime.ui.TouchEvent;
-import lime.ui.WindowEventManager;
+import lime.ui.TouchEventManager;
+import lime.ui.Window;
import lime.ui.WindowEvent;
-import lime.system.System;
+import lime.ui.WindowEventManager;
class Application implements IKeyEventListener implements IMouseEventListener implements IRenderEventListener implements ITouchEventListener implements IUpdateEventListener implements IWindowEventListener {
diff --git a/lime/app/IRenderEventListener.hx b/lime/graphics/IRenderEventListener.hx
similarity index 78%
rename from lime/app/IRenderEventListener.hx
rename to lime/graphics/IRenderEventListener.hx
index 490e24388..c0ba15bbd 100644
--- a/lime/app/IRenderEventListener.hx
+++ b/lime/graphics/IRenderEventListener.hx
@@ -1,4 +1,4 @@
-package lime.app;
+package lime.graphics;
interface IRenderEventListener {
diff --git a/lime/app/RenderEvent.hx b/lime/graphics/RenderEvent.hx
similarity index 92%
rename from lime/app/RenderEvent.hx
rename to lime/graphics/RenderEvent.hx
index 690bd0bfd..edc6d89cc 100644
--- a/lime/app/RenderEvent.hx
+++ b/lime/graphics/RenderEvent.hx
@@ -1,4 +1,4 @@
-package lime.app;
+package lime.graphics;
class RenderEvent {
diff --git a/lime/app/RenderEventManager.hx b/lime/graphics/RenderEventManager.hx
similarity index 97%
rename from lime/app/RenderEventManager.hx
rename to lime/graphics/RenderEventManager.hx
index c0f71ca2f..898a01fb9 100644
--- a/lime/app/RenderEventManager.hx
+++ b/lime/graphics/RenderEventManager.hx
@@ -1,4 +1,4 @@
-package lime.app;
+package lime.graphics;
import lime.system.System;
diff --git a/lime/app/Renderer.hx b/lime/graphics/Renderer.hx
similarity index 92%
rename from lime/app/Renderer.hx
rename to lime/graphics/Renderer.hx
index 4e8b2c3f5..5d8bebcd0 100644
--- a/lime/app/Renderer.hx
+++ b/lime/graphics/Renderer.hx
@@ -1,7 +1,8 @@
-package lime.app;
+package lime.graphics;
import lime.system.System;
+import lime.ui.Window;
class Renderer {
@@ -36,4 +37,4 @@ class Renderer {
#end
-}
\ No newline at end of file
+}
diff --git a/lime/app/Window.hx b/lime/ui/Window.hx
similarity index 87%
rename from lime/app/Window.hx
rename to lime/ui/Window.hx
index 2d00758a4..7f9cdf751 100644
--- a/lime/app/Window.hx
+++ b/lime/ui/Window.hx
@@ -1,6 +1,7 @@
-package lime.app;
+package lime.ui;
+import lime.app.Application;
import lime.system.System;
diff --git a/project/Build.xml b/project/Build.xml
index c1bb71481..d5b573ca8 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -48,8 +48,8 @@
-
+
diff --git a/project/include/app/RenderEvent.h b/project/include/graphics/RenderEvent.h
similarity index 79%
rename from project/include/app/RenderEvent.h
rename to project/include/graphics/RenderEvent.h
index 534c41416..526f0733a 100644
--- a/project/include/app/RenderEvent.h
+++ b/project/include/graphics/RenderEvent.h
@@ -1,5 +1,5 @@
-#ifndef LIME_APP_RENDER_EVENT_H
-#define LIME_APP_RENDER_EVENT_H
+#ifndef LIME_GRAPHICS_RENDER_EVENT_H
+#define LIME_GRAPHICS_RENDER_EVENT_H
#include
diff --git a/project/include/app/Renderer.h b/project/include/graphics/Renderer.h
similarity index 66%
rename from project/include/app/Renderer.h
rename to project/include/graphics/Renderer.h
index 873fa8d07..d31ec5404 100644
--- a/project/include/app/Renderer.h
+++ b/project/include/graphics/Renderer.h
@@ -1,8 +1,8 @@
-#ifndef LIME_APP_RENDERER_H
-#define LIME_APP_RENDERER_H
+#ifndef LIME_GRAPHICS_RENDERER_H
+#define LIME_GRAPHICS_RENDERER_H
-#include
+#include
namespace lime {
diff --git a/project/include/app/Window.h b/project/include/ui/Window.h
similarity index 77%
rename from project/include/app/Window.h
rename to project/include/ui/Window.h
index da2234ff8..453082049 100644
--- a/project/include/app/Window.h
+++ b/project/include/ui/Window.h
@@ -1,5 +1,5 @@
-#ifndef LIME_APP_WINDOW_H
-#define LIME_APP_WINDOW_H
+#ifndef LIME_UI_WINDOW_H
+#define LIME_UI_WINDOW_H
#include
diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp
index 89374a878..ffccce343 100644
--- a/project/src/ExternalInterface.cpp
+++ b/project/src/ExternalInterface.cpp
@@ -9,13 +9,13 @@
#include
#include
-#include
-#include
#include
-#include
+#include
+#include
#include
#include
#include
+#include
#include
diff --git a/project/src/app/RenderEvent.cpp b/project/src/app/RenderEvent.cpp
deleted file mode 100644
index ea90e8435..000000000
--- a/project/src/app/RenderEvent.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include
-#include
-
-
-namespace lime {
-
-
- AutoGCRoot* RenderEvent::callback = 0;
- AutoGCRoot* RenderEvent::eventObject = 0;
-
- //static int id_type;
- //static bool init = false;
-
-
- RenderEvent::RenderEvent () {
-
- type = RENDER;
-
- }
-
-
- void RenderEvent::Dispatch (RenderEvent* event) {
-
- if (RenderEvent::callback) {
-
- //if (!init) {
-
- //id_type = val_id ("type");
-
- //}
-
- value object = (RenderEvent::eventObject ? RenderEvent::eventObject->get () : alloc_empty_object ());
-
- //alloc_field (object, id_type, alloc_int (event->type));
-
- val_call1 (RenderEvent::callback->get (), object);
-
- }
-
- }
-
-
-}
\ No newline at end of file
diff --git a/project/src/backend/sdl/SDLApplication.h b/project/src/backend/sdl/SDLApplication.h
index 4033c972b..782a96603 100644
--- a/project/src/backend/sdl/SDLApplication.h
+++ b/project/src/backend/sdl/SDLApplication.h
@@ -4,8 +4,8 @@
#include
#include
-#include
#include
+#include
#include
#include
#include
diff --git a/project/src/backend/sdl/SDLRenderer.h b/project/src/backend/sdl/SDLRenderer.h
index dbd62a48d..094be6100 100644
--- a/project/src/backend/sdl/SDLRenderer.h
+++ b/project/src/backend/sdl/SDLRenderer.h
@@ -3,7 +3,7 @@
#include
-#include
+#include
namespace lime {
diff --git a/project/src/backend/sdl/SDLWindow.h b/project/src/backend/sdl/SDLWindow.h
index 3518a8807..d55df2c3a 100644
--- a/project/src/backend/sdl/SDLWindow.h
+++ b/project/src/backend/sdl/SDLWindow.h
@@ -3,7 +3,7 @@
#include
-#include
+#include
namespace lime {