diff --git a/Makefile b/Makefile
index 3a97413..8163ae1 100644
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,8 @@ OBJECTS = $(patsubst $(SRCDIR)/%.cpp,$(OBJDIR)/%.o,$(SOURCES))
 $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
 	g++ -c $< -o $@ $(RAYOPT) $(RAYINCLUDE) $(INCLUDE) $(CFLAGS)
 
-main: main.cpp setup $(RAYOBJECTS) $(OBJECTS)
-	g++ main.cpp $(RAYOBJECTS) $(OBJECTS) -o main $(RAYOPT) $(RAYINCLUDE) $(INCLUDE) $(CFLAGS)
+main: setup $(RAYOBJECTS) $(OBJECTS)
+	g++ $(RAYOBJECTS) $(OBJECTS) -o main $(RAYOPT) $(RAYINCLUDE) $(INCLUDE) $(CFLAGS)
 
 example: example.cpp setup $(RAYOBJECTS) $(OBJECTS)
 	g++ example.cpp $(RAYOBJECTS) $(OBJECTS) -o example $(RAYOPT) $(RAYINCLUDE) $(INCLUDE) $(CFLAGS)
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp