diff --git a/thpj3/fonts/fn_GUI/fn_GUI.yy b/thpj3/fonts/fn_GUI/fn_GUI.yy
index 58d64a4..fa278f4 100644
--- a/thpj3/fonts/fn_GUI/fn_GUI.yy
+++ b/thpj3/fonts/fn_GUI/fn_GUI.yy
@@ -559,8 +559,8 @@
   "canGenerateBitmap": true,
   "maintainGms1Font": false,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "fn_GUI",
diff --git a/thpj3/objects/obj_bullet_test/obj_bullet_test.yy b/thpj3/objects/obj_bullet_test/obj_bullet_test.yy
index 8214ea8..b9423d7 100644
--- a/thpj3/objects/obj_bullet_test/obj_bullet_test.yy
+++ b/thpj3/objects/obj_bullet_test/obj_bullet_test.yy
@@ -27,8 +27,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_bullet_test",
diff --git a/thpj3/objects/obj_disclaimer/Create_0.gml b/thpj3/objects/obj_disclaimer/Create_0.gml
index f77b392..a286062 100644
--- a/thpj3/objects/obj_disclaimer/Create_0.gml
+++ b/thpj3/objects/obj_disclaimer/Create_0.gml
@@ -1,4 +1,4 @@
 counter = 0;
-countermax = 420;
+countermax = 240;
 
 alpha_cycle = 0;
\ No newline at end of file
diff --git a/thpj3/objects/obj_disclaimer/Step_0.gml b/thpj3/objects/obj_disclaimer/Step_0.gml
index 764ed00..331357c 100644
--- a/thpj3/objects/obj_disclaimer/Step_0.gml
+++ b/thpj3/objects/obj_disclaimer/Step_0.gml
@@ -1,9 +1,9 @@
 counter++;
 
-if (counter > 360) {
-	alpha_cycle = (420 - counter) / 60;
+if (counter > 180) {
+	alpha_cycle = (210 - counter) / 30;
 } else {
-	alpha_cycle = counter / 60;
+	alpha_cycle = counter / 30;
 }
 
 if ( counter >= countermax ) {
diff --git a/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml b/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml
index 39c1625..9cfd20a 100644
--- a/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml
+++ b/thpj3/objects/obj_enemy_bullet_parent/Step_0.gml
@@ -1,5 +1,5 @@
-if ( obj_wriggle.bombing || obj_wriggle.respawn ) {
-	if ( obj_wriggle.hyper_time ) {
+if ( obj_wriggle.bombing || obj_wriggle.respawn || obj_dialogue.dialogue_mode ) {
+	if ( obj_wriggle.hyper_time && !obj_dialogue.dialogue_mode ) {
 //TODO: create a point item if during a hyper
 	}
 	instance_destroy();
diff --git a/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy b/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy
index 3579b60..1ef7c6b 100644
--- a/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy
+++ b/thpj3/objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy
@@ -25,8 +25,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_enemy_bullet_parent",
diff --git a/thpj3/objects/obj_enemy_parent/Create_0.gml b/thpj3/objects/obj_enemy_parent/Create_0.gml
index 20f1c38..d7f0e2b 100644
--- a/thpj3/objects/obj_enemy_parent/Create_0.gml
+++ b/thpj3/objects/obj_enemy_parent/Create_0.gml
@@ -1,2 +1,3 @@
 hp = 10;
-temp_speed = 0;
\ No newline at end of file
+temp_speed = 0;
+face_dir = LEFT;
\ No newline at end of file
diff --git a/thpj3/objects/obj_enemy_parent/Draw_0.gml b/thpj3/objects/obj_enemy_parent/Draw_0.gml
new file mode 100644
index 0000000..24a0cc1
--- /dev/null
+++ b/thpj3/objects/obj_enemy_parent/Draw_0.gml
@@ -0,0 +1,2 @@
+image_xscale = face_dir;
+draw_self();
\ No newline at end of file
diff --git a/thpj3/objects/obj_enemy_parent/Step_0.gml b/thpj3/objects/obj_enemy_parent/Step_0.gml
index d295eb7..ada2952 100644
--- a/thpj3/objects/obj_enemy_parent/Step_0.gml
+++ b/thpj3/objects/obj_enemy_parent/Step_0.gml
@@ -1,5 +1,8 @@
-if ( hp <= 0 ) {
+if ( hp <= 0 || obj_dialogue.dialogue_mode ) {
 	instance_destroy();
+	if ( !obj_dialogue.dialogue_mode ) {
+//TODO: point system for kills
+	}
 }
 if ( obj_wriggle.emergency ) {
 	temp_speed = speed;
diff --git a/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy b/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy
index b96d180..3079515 100644
--- a/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy
+++ b/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy
@@ -22,12 +22,13 @@
     {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
     {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
     {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
   ],
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_enemy_parent",
diff --git a/thpj3/objects/obj_enemy_test/obj_enemy_test.yy b/thpj3/objects/obj_enemy_test/obj_enemy_test.yy
index 56d3f7e..bd38f66 100644
--- a/thpj3/objects/obj_enemy_test/obj_enemy_test.yy
+++ b/thpj3/objects/obj_enemy_test/obj_enemy_test.yy
@@ -30,8 +30,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_enemy_test",
diff --git a/thpj3/objects/obj_option_shot/obj_option_shot.yy b/thpj3/objects/obj_option_shot/obj_option_shot.yy
index e01c85a..c6abe8a 100644
--- a/thpj3/objects/obj_option_shot/obj_option_shot.yy
+++ b/thpj3/objects/obj_option_shot/obj_option_shot.yy
@@ -27,8 +27,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_option_shot",
diff --git a/thpj3/objects/obj_options/obj_options.yy b/thpj3/objects/obj_options/obj_options.yy
index dfc9cb9..a96e649 100644
--- a/thpj3/objects/obj_options/obj_options.yy
+++ b/thpj3/objects/obj_options/obj_options.yy
@@ -28,8 +28,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_options",
diff --git a/thpj3/objects/obj_player_shot/obj_player_shot.yy b/thpj3/objects/obj_player_shot/obj_player_shot.yy
index 8998c00..6837767 100644
--- a/thpj3/objects/obj_player_shot/obj_player_shot.yy
+++ b/thpj3/objects/obj_player_shot/obj_player_shot.yy
@@ -26,8 +26,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_player_shot",
diff --git a/thpj3/objects/obj_stage_controller/Create_0.gml b/thpj3/objects/obj_stage_controller/Create_0.gml
new file mode 100644
index 0000000..9a0af11
--- /dev/null
+++ b/thpj3/objects/obj_stage_controller/Create_0.gml
@@ -0,0 +1,3 @@
+timeline_index = tl_stage1_logic;
+timeline_running = true;
+timeline_loop = false;
diff --git a/thpj3/objects/obj_stage_controller/Step_0.gml b/thpj3/objects/obj_stage_controller/Step_0.gml
new file mode 100644
index 0000000..b6f9cf1
--- /dev/null
+++ b/thpj3/objects/obj_stage_controller/Step_0.gml
@@ -0,0 +1,5 @@
+if ( obj_dialogue.dialogue_mode ) {
+	timeline_running = false;
+} else {
+	timeline_running = true;
+}
\ No newline at end of file
diff --git a/thpj3/objects/obj_stage_controller/obj_stage_controller.yy b/thpj3/objects/obj_stage_controller/obj_stage_controller.yy
new file mode 100644
index 0000000..9ff63d4
--- /dev/null
+++ b/thpj3/objects/obj_stage_controller/obj_stage_controller.yy
@@ -0,0 +1,34 @@
+{
+  "spriteId": null,
+  "solid": false,
+  "visible": true,
+  "spriteMaskId": null,
+  "persistent": false,
+  "parentObjectId": null,
+  "physicsObject": false,
+  "physicsSensor": false,
+  "physicsShape": 1,
+  "physicsGroup": 1,
+  "physicsDensity": 0.5,
+  "physicsRestitution": 0.1,
+  "physicsLinearDamping": 0.1,
+  "physicsAngularDamping": 0.1,
+  "physicsFriction": 0.2,
+  "physicsStartAwake": true,
+  "physicsKinematic": false,
+  "physicsShapePoints": [],
+  "eventList": [
+    {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+  ],
+  "properties": [],
+  "overriddenProperties": [],
+  "parent": {
+    "name": "stage",
+    "path": "folders/stage.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "obj_stage_controller",
+  "tags": [],
+  "resourceType": "GMObject",
+}
\ No newline at end of file
diff --git a/thpj3/objects/obj_wriggle/Create_0.gml b/thpj3/objects/obj_wriggle/Create_0.gml
index bcdf21f..be5e5c9 100644
--- a/thpj3/objects/obj_wriggle/Create_0.gml
+++ b/thpj3/objects/obj_wriggle/Create_0.gml
@@ -18,12 +18,14 @@ shoot_delay = 0;
 x = SPAWN_X;
 y = SPAWN_Y;
 
-top_option = instance_create_layer(x,y,"Instances", obj_options);
+top_option = instance_create_layer(x,y,"player", obj_options);
 with (top_option) {
 	side_modifier = TOP;
 }
 
-bottom_option = instance_create_layer(x,y,"Instances", obj_options);
+bottom_option = instance_create_layer(x,y,"player", obj_options);
 with (bottom_option) {
 	side_modifier = BOTTOM;
-}
\ No newline at end of file
+}
+
+testtext = 1000;
\ No newline at end of file
diff --git a/thpj3/objects/obj_wriggle/Step_0.gml b/thpj3/objects/obj_wriggle/Step_0.gml
index d9d2f3d..f61ae7f 100644
--- a/thpj3/objects/obj_wriggle/Step_0.gml
+++ b/thpj3/objects/obj_wriggle/Step_0.gml
@@ -3,11 +3,13 @@ bombing--;
 recovery--;
 respawn--;
 emergency--;
-hyper_time--;
 shoot_delay--;
 h_move = 0;
 v_move = 0;
-hyper_current += .02;
+if (!obj_dialogue.dialogue_mode) {
+	hyper_current += .02;
+	hyper_time--;
+}
 
 input_up = keyboard_check( vk_up );
 input_down = keyboard_check( vk_down );
@@ -51,7 +53,7 @@ if ( bombing || recovery || emergency || respawn || obj_dialogue.dialogue_mode )
 }
 
 //bomb logic
-if ( input_bomb && !bombing && !recovery && !respawn ) {
+if ( input_bomb && !bombing && !recovery && !respawn && !obj_dialogue.dialogue_mode ) {
 	//death bomb	
 	if ( emergency ) {
 		if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) {
@@ -136,7 +138,7 @@ if ( !emergency && !respawn ) {
 }
 
 //shot and facing logic
-if ( !emergency && !respawn ) {
+if ( !emergency && !respawn && !obj_dialogue.dialogue_mode ) {
 	//change directions if only one is held
 	if ( input_shot_left && !input_shot_right ) {
 		face_dir = LEFT;		
@@ -147,7 +149,7 @@ if ( !emergency && !respawn ) {
 	if ( input_shot_left || input_shot_right ) {
 		if ( shoot_delay <= 0 ) {
 			shoot_delay = SHOT_DELAY;
-			var shooty = instance_create_layer( x + (face_dir * 10), y + (TOP * 10), "Instances", obj_player_shot);
+			var shooty = instance_create_layer( x + (face_dir * 10), y + (TOP * 10), "player", obj_player_shot);
 			with (shooty) {
 				face_dir = other.face_dir;
 				damage = SHOT_PLAYER_DAMAGE;
@@ -155,7 +157,7 @@ if ( !emergency && !respawn ) {
 				direction = 270 + (90 * face_dir);
 				image_angle = direction;
 			}
-			var shooty = instance_create_layer( x + (face_dir * 10), y + (BOTTOM * 10), "Instances", obj_player_shot);
+			var shooty = instance_create_layer( x + (face_dir * 10), y + (BOTTOM * 10), "player", obj_player_shot);
 			with (shooty) {
 				face_dir = other.face_dir;
 				damage = SHOT_PLAYER_DAMAGE;
@@ -164,7 +166,7 @@ if ( !emergency && !respawn ) {
 				image_angle = direction;
 			}
 			for (var i = 0; i < 40; i += 10) {
-				var shotia = instance_create_layer( top_option.x, top_option.y, "Instances", obj_option_shot);
+				var shotia = instance_create_layer( top_option.x, top_option.y, "player", obj_option_shot);
 				with (shotia) {
 					face_dir = other.face_dir;
 					damage = SHOT_OPTION_DAMAGE;
@@ -172,7 +174,7 @@ if ( !emergency && !respawn ) {
 					direction = point_direction( other.x, other.y, other.top_option.x, other.top_option.y ) - (i * face_dir);
 					image_angle = direction;
 				}
-				var shotia = instance_create_layer( bottom_option.x, bottom_option.y, "Instances", obj_option_shot);
+				var shotia = instance_create_layer( bottom_option.x, bottom_option.y, "player", obj_option_shot);
 				with (shotia) {
 					face_dir = other.face_dir;
 					damage = SHOT_OPTION_DAMAGE;
@@ -189,4 +191,10 @@ if ( !emergency && !respawn ) {
 if ( lives_current == 0 ) {
 //TODO: add score and continue logic
 	room_goto(rm_title);
+}
+
+
+
+if (keyboard_check( vk_escape ) ) {
+	game_end();
 }
\ No newline at end of file
diff --git a/thpj3/objects/obj_wriggle/obj_wriggle.yy b/thpj3/objects/obj_wriggle/obj_wriggle.yy
index ec5a504..a4934e6 100644
--- a/thpj3/objects/obj_wriggle/obj_wriggle.yy
+++ b/thpj3/objects/obj_wriggle/obj_wriggle.yy
@@ -28,8 +28,8 @@
   "properties": [],
   "overriddenProperties": [],
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "obj_wriggle",
diff --git a/thpj3/rooms/Room3/Room3.yy b/thpj3/rooms/Room3/Room3.yy
deleted file mode 100644
index 265464c..0000000
--- a/thpj3/rooms/Room3/Room3.yy
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "isDnd": false,
-  "volume": 1.0,
-  "parentRoom": null,
-  "views": [
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
-  ],
-  "layers": [
-    {"instances":[
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":448.0,"resourceVersion":"1.0","name":"inst_1ED821BC","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":128.0,"resourceVersion":"1.0","name":"inst_61D7FC1F","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":832.0,"y":96.0,"resourceVersion":"1.0","name":"inst_46D8A64E","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":768.0,"y":256.0,"resourceVersion":"1.0","name":"inst_54357CBC","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":960.0,"y":320.0,"resourceVersion":"1.0","name":"inst_1743B867","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1056.0,"y":160.0,"resourceVersion":"1.0","name":"inst_30573D51","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":736.0,"y":512.0,"resourceVersion":"1.0","name":"inst_3ED0F16","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":960.0,"y":608.0,"resourceVersion":"1.0","name":"inst_785FEC2","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":864.0,"y":448.0,"resourceVersion":"1.0","name":"inst_4AFCD551","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":704.0,"y":640.0,"resourceVersion":"1.0","name":"inst_562A4B4B","tags":[],"resourceType":"GMRInstance",},
-      ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",},
-    {"spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",},
-  ],
-  "inheritLayers": false,
-  "creationCodeFile": "",
-  "inheritCode": false,
-  "instanceCreationOrder": [
-    {"name":"inst_1ED821BC","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_61D7FC1F","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_46D8A64E","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_54357CBC","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_1743B867","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_30573D51","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_3ED0F16","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_785FEC2","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_4AFCD551","path":"rooms/Room3/Room3.yy",},
-    {"name":"inst_562A4B4B","path":"rooms/Room3/Room3.yy",},
-  ],
-  "inheritCreationOrder": false,
-  "sequenceId": null,
-  "roomSettings": {
-    "inheritRoomSettings": false,
-    "Width": 1280,
-    "Height": 720,
-    "persistent": false,
-  },
-  "viewSettings": {
-    "inheritViewSettings": false,
-    "enableViews": false,
-    "clearViewBackground": false,
-    "clearDisplayBuffer": true,
-  },
-  "physicsSettings": {
-    "inheritPhysicsSettings": false,
-    "PhysicsWorld": false,
-    "PhysicsWorldGravityX": 0.0,
-    "PhysicsWorldGravityY": 10.0,
-    "PhysicsWorldPixToMetres": 0.1,
-  },
-  "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
-  },
-  "resourceVersion": "1.0",
-  "name": "Room3",
-  "tags": [],
-  "resourceType": "GMRoom",
-}
\ No newline at end of file
diff --git a/thpj3/rooms/rm_stage1/rm_stage1.yy b/thpj3/rooms/rm_stage1/rm_stage1.yy
new file mode 100644
index 0000000..059d8a4
--- /dev/null
+++ b/thpj3/rooms/rm_stage1/rm_stage1.yy
@@ -0,0 +1,71 @@
+{
+  "isDnd": false,
+  "volume": 1.0,
+  "parentRoom": null,
+  "views": [
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+    {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,},
+  ],
+  "layers": [
+    {"instances":[
+        {"properties":[],"isDnd":false,"objectId":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":448.0,"resourceVersion":"1.0","name":"inst_1FC80063","tags":[],"resourceType":"GMRInstance",},
+      ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"GUI","tags":[],"resourceType":"GMRInstanceLayer",},
+    {"instances":[],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"enemy","tags":[],"resourceType":"GMRInstanceLayer",},
+    {"instances":[
+        {"properties":[],"isDnd":false,"objectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":224.0,"resourceVersion":"1.0","name":"inst_79020E92","tags":[],"resourceType":"GMRInstance",},
+      ],"visible":true,"depth":200,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"player","tags":[],"resourceType":"GMRInstanceLayer",},
+    {"instances":[
+        {"properties":[],"isDnd":false,"objectId":{"name":"obj_stage_controller","path":"objects/obj_stage_controller/obj_stage_controller.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":0.0,"y":0.0,"resourceVersion":"1.0","name":"inst_41ECD54B","tags":[],"resourceType":"GMRInstance",},
+      ],"visible":true,"depth":300,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"controllers","tags":[],"resourceType":"GMRInstanceLayer",},
+    {"spriteId":{"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-10.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":400,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"ground","tags":[],"resourceType":"GMRBackgroundLayer",},
+    {"spriteId":{"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-5.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":500,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"forest","tags":[],"resourceType":"GMRBackgroundLayer",},
+    {"assets":[
+        {"ignore":false,"spriteId":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":0.46875,"scaleY":0.46875,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"inheritItemSettings":false,"x":1024.0,"y":128.0,"resourceVersion":"1.0","name":"graphic_6AB766E1","tags":[],"resourceType":"GMRSpriteGraphic",},
+      ],"visible":true,"depth":600,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"moon","tags":[],"resourceType":"GMRAssetLayer",},
+    {"spriteId":{"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-0.3,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":700,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"stars","tags":[],"resourceType":"GMRBackgroundLayer",},
+    {"spriteId":{"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":false,"hspeed":-0.3,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":800,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"sky","tags":[],"resourceType":"GMRBackgroundLayer",},
+  ],
+  "inheritLayers": false,
+  "creationCodeFile": "",
+  "inheritCode": false,
+  "instanceCreationOrder": [
+    {"name":"inst_79020E92","path":"rooms/rm_stage1/rm_stage1.yy",},
+    {"name":"inst_1FC80063","path":"rooms/rm_stage1/rm_stage1.yy",},
+    {"name":"inst_41ECD54B","path":"rooms/rm_stage1/rm_stage1.yy",},
+  ],
+  "inheritCreationOrder": false,
+  "sequenceId": null,
+  "roomSettings": {
+    "inheritRoomSettings": false,
+    "Width": 1280,
+    "Height": 720,
+    "persistent": false,
+  },
+  "viewSettings": {
+    "inheritViewSettings": false,
+    "enableViews": false,
+    "clearViewBackground": false,
+    "clearDisplayBuffer": true,
+  },
+  "physicsSettings": {
+    "inheritPhysicsSettings": false,
+    "PhysicsWorld": false,
+    "PhysicsWorldGravityX": 0.0,
+    "PhysicsWorldGravityY": 10.0,
+    "PhysicsWorldPixToMetres": 0.1,
+  },
+  "parent": {
+    "name": "thpj3",
+    "path": "thpj3.yyp",
+  },
+  "resourceVersion": "1.0",
+  "name": "rm_stage1",
+  "tags": [],
+  "resourceType": "GMRoom",
+}
\ No newline at end of file
diff --git a/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.yy b/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.yy
index a374fdd..72aae02 100644
--- a/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.yy
+++ b/thpj3/scripts/scr_dialogue_start/scr_dialogue_start.yy
@@ -2,8 +2,8 @@
   "isDnD": false,
   "isCompatibility": false,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "dialogue",
+    "path": "folders/dialogue.yy",
   },
   "resourceVersion": "1.0",
   "name": "scr_dialogue_start",
diff --git a/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml b/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml
index 86d5779..b4cf4d4 100644
--- a/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml
+++ b/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.gml
@@ -7,7 +7,7 @@
 function scr_pattern_fire( _pattern, _speed, _bullet ) {
 	switch ( _pattern ) {
 		case PATTERN_STREAM:
-			exy = instance_create_layer( x, y, "Instances", _bullet );
+			exy = instance_create_layer( x, y, "enemy", _bullet );
 			with (exy) {
 				speed = _speed + obj_wriggle.hyper_tier;
 				direction = point_direction( x, y, obj_wriggle.x, obj_wriggle.y );
diff --git a/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.yy b/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.yy
index 734f649..a3bd5b3 100644
--- a/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.yy
+++ b/thpj3/scripts/scr_pattern_fire/scr_pattern_fire.yy
@@ -2,8 +2,8 @@
   "isDnD": false,
   "isCompatibility": false,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "scr_pattern_fire",
diff --git a/thpj3/sprites/spr_bg_forest/410206bd-1f6b-4641-81f9-2951d51d9384.png b/thpj3/sprites/spr_bg_forest/410206bd-1f6b-4641-81f9-2951d51d9384.png
new file mode 100644
index 0000000..c7df6ca
Binary files /dev/null and b/thpj3/sprites/spr_bg_forest/410206bd-1f6b-4641-81f9-2951d51d9384.png differ
diff --git a/thpj3/sprites/spr_bg_forest/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png b/thpj3/sprites/spr_bg_forest/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png
new file mode 100644
index 0000000..c7df6ca
Binary files /dev/null and b/thpj3/sprites/spr_bg_forest/layers/410206bd-1f6b-4641-81f9-2951d51d9384/2fcad704-d1eb-4019-bc74-f62e0b85dbec.png differ
diff --git a/thpj3/sprites/spr_player_shot12/spr_player_shot.yy b/thpj3/sprites/spr_bg_forest/spr_bg_forest.yy
similarity index 51%
rename from thpj3/sprites/spr_player_shot12/spr_player_shot.yy
rename to thpj3/sprites/spr_bg_forest/spr_bg_forest.yy
index 874e43e..ab4b5fe 100644
--- a/thpj3/sprites/spr_player_shot12/spr_player_shot.yy
+++ b/thpj3/sprites/spr_bg_forest/spr_bg_forest.yy
@@ -2,20 +2,20 @@
   "bboxMode": 0,
   "collisionKind": 1,
   "type": 0,
-  "origin": 4,
+  "origin": 0,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
-  "bbox_left": 10,
-  "bbox_right": 56,
-  "bbox_top": 3,
-  "bbox_bottom": 60,
+  "bbox_left": 0,
+  "bbox_right": 719,
+  "bbox_top": 192,
+  "bbox_bottom": 719,
   "HTile": false,
   "VTile": false,
   "For3D": false,
-  "width": 64,
-  "height": 64,
+  "width": 720,
+  "height": 720,
   "textureGroupId": {
     "name": "Default",
     "path": "texturegroups/Default",
@@ -24,12 +24,12 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","path":"sprites/spr_player_shot/spr_player_shot.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","path":"sprites/spr_player_shot/spr_player_shot.yy",},"LayerId":{"name":"74e04539-a659-429b-8758-3c93a2085793","path":"sprites/spr_player_shot/spr_player_shot.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"spr_player_shot","path":"sprites/spr_player_shot/spr_player_shot.yy",},"resourceVersion":"1.0","name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"LayerId":{"name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"resourceVersion":"1.0","name":"410206bd-1f6b-4641-81f9-2951d51d9384","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
-    "spriteId": {"name":"spr_player_shot","path":"sprites/spr_player_shot/spr_player_shot.yy",},
+    "spriteId": {"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},
     "timeUnits": 1,
     "playback": 1,
     "playbackSpeed": 30.0,
@@ -41,7 +41,7 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"a2f61cfa-22d9-465b-9a36-216d431782ac","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","path":"sprites/spr_player_shot/spr_player_shot.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"a34e6add-de46-412e-a094-1fd758ba7d4a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"410206bd-1f6b-4641-81f9-2951d51d9384","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -54,26 +54,26 @@
     "backdropHeight": 768,
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
-    "xorigin": 32,
-    "yorigin": 32,
+    "xorigin": 0,
+    "yorigin": 0,
     "eventToFunction": {},
     "eventStubScript": null,
-    "parent": {"name":"spr_player_shot","path":"sprites/spr_player_shot/spr_player_shot.yy",},
+    "parent": {"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},
     "resourceVersion": "1.3",
-    "name": "spr_player_shot",
+    "name": "spr_bg_forest",
     "tags": [],
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"74e04539-a659-429b-8758-3c93a2085793","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2fcad704-d1eb-4019-bc74-f62e0b85dbec","tags":[],"resourceType":"GMImageLayer",},
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "stage",
+    "path": "folders/stage.yy",
   },
   "resourceVersion": "1.0",
-  "name": "spr_player_shot",
+  "name": "spr_bg_forest",
   "tags": [],
   "resourceType": "GMSprite",
 }
\ No newline at end of file
diff --git a/thpj3/sprites/spr_bg_ground/a0bebaa0-3d2f-4186-b95a-cc53e7db4574.png b/thpj3/sprites/spr_bg_ground/a0bebaa0-3d2f-4186-b95a-cc53e7db4574.png
new file mode 100644
index 0000000..81ec0e2
Binary files /dev/null and b/thpj3/sprites/spr_bg_ground/a0bebaa0-3d2f-4186-b95a-cc53e7db4574.png differ
diff --git a/thpj3/sprites/spr_bg_ground/layers/a0bebaa0-3d2f-4186-b95a-cc53e7db4574/fae793a2-8c38-4a0c-9074-a263ddee3219.png b/thpj3/sprites/spr_bg_ground/layers/a0bebaa0-3d2f-4186-b95a-cc53e7db4574/fae793a2-8c38-4a0c-9074-a263ddee3219.png
new file mode 100644
index 0000000..81ec0e2
Binary files /dev/null and b/thpj3/sprites/spr_bg_ground/layers/a0bebaa0-3d2f-4186-b95a-cc53e7db4574/fae793a2-8c38-4a0c-9074-a263ddee3219.png differ
diff --git a/thpj3/sprites/spr_player_shot12/spr_player_shot12.yy b/thpj3/sprites/spr_bg_ground/spr_bg_ground.yy
similarity index 50%
rename from thpj3/sprites/spr_player_shot12/spr_player_shot12.yy
rename to thpj3/sprites/spr_bg_ground/spr_bg_ground.yy
index af71749..4c07cda 100644
--- a/thpj3/sprites/spr_player_shot12/spr_player_shot12.yy
+++ b/thpj3/sprites/spr_bg_ground/spr_bg_ground.yy
@@ -2,20 +2,20 @@
   "bboxMode": 0,
   "collisionKind": 1,
   "type": 0,
-  "origin": 4,
+  "origin": 0,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
-  "bbox_left": 10,
-  "bbox_right": 56,
-  "bbox_top": 3,
-  "bbox_bottom": 60,
+  "bbox_left": 0,
+  "bbox_right": 719,
+  "bbox_top": 545,
+  "bbox_bottom": 719,
   "HTile": false,
   "VTile": false,
   "For3D": false,
-  "width": 64,
-  "height": 64,
+  "width": 720,
+  "height": 720,
   "textureGroupId": {
     "name": "Default",
     "path": "texturegroups/Default",
@@ -24,12 +24,12 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},"LayerId":{"name":"74e04539-a659-429b-8758-3c93a2085793","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"spr_player_shot12","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},"resourceVersion":"1.0","name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"a0bebaa0-3d2f-4186-b95a-cc53e7db4574","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"a0bebaa0-3d2f-4186-b95a-cc53e7db4574","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"LayerId":{"name":"fae793a2-8c38-4a0c-9074-a263ddee3219","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"resourceVersion":"1.0","name":"a0bebaa0-3d2f-4186-b95a-cc53e7db4574","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
-    "spriteId": {"name":"spr_player_shot12","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},
+    "spriteId": {"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},
     "timeUnits": 1,
     "playback": 1,
     "playbackSpeed": 30.0,
@@ -41,7 +41,7 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"2a4d77bf-e2bf-4473-a8ac-5af0ae7f432a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0db8d50d-5b50-4e61-95c9-9c4a7775f05d","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"1075c1a9-26ab-42ed-9d96-54395e13639a","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a0bebaa0-3d2f-4186-b95a-cc53e7db4574","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -54,26 +54,26 @@
     "backdropHeight": 768,
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
-    "xorigin": 32,
-    "yorigin": 32,
+    "xorigin": 0,
+    "yorigin": 0,
     "eventToFunction": {},
     "eventStubScript": null,
-    "parent": {"name":"spr_player_shot12","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},
+    "parent": {"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},
     "resourceVersion": "1.3",
-    "name": "spr_player_shot",
+    "name": "spr_bg_ground",
     "tags": [],
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"74e04539-a659-429b-8758-3c93a2085793","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fae793a2-8c38-4a0c-9074-a263ddee3219","tags":[],"resourceType":"GMImageLayer",},
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "stage",
+    "path": "folders/stage.yy",
   },
   "resourceVersion": "1.0",
-  "name": "spr_player_shot12",
+  "name": "spr_bg_ground",
   "tags": [],
   "resourceType": "GMSprite",
 }
\ No newline at end of file
diff --git a/thpj3/sprites/spr_bg_sky/c59050e3-2a37-49fb-8056-6ebfbaaa3c5a.png b/thpj3/sprites/spr_bg_sky/c59050e3-2a37-49fb-8056-6ebfbaaa3c5a.png
new file mode 100644
index 0000000..82e572c
Binary files /dev/null and b/thpj3/sprites/spr_bg_sky/c59050e3-2a37-49fb-8056-6ebfbaaa3c5a.png differ
diff --git a/thpj3/sprites/spr_bg_sky/layers/c59050e3-2a37-49fb-8056-6ebfbaaa3c5a/454f3ae8-028c-4bca-8611-391b04f3213b.png b/thpj3/sprites/spr_bg_sky/layers/c59050e3-2a37-49fb-8056-6ebfbaaa3c5a/454f3ae8-028c-4bca-8611-391b04f3213b.png
new file mode 100644
index 0000000..82e572c
Binary files /dev/null and b/thpj3/sprites/spr_bg_sky/layers/c59050e3-2a37-49fb-8056-6ebfbaaa3c5a/454f3ae8-028c-4bca-8611-391b04f3213b.png differ
diff --git a/thpj3/sprites/spr_bg_sky/spr_bg_sky.yy b/thpj3/sprites/spr_bg_sky/spr_bg_sky.yy
new file mode 100644
index 0000000..9f18010
--- /dev/null
+++ b/thpj3/sprites/spr_bg_sky/spr_bg_sky.yy
@@ -0,0 +1,79 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 1,
+  "type": 0,
+  "origin": 0,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 0,
+  "bbox_right": 719,
+  "bbox_top": 0,
+  "bbox_bottom": 719,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 720,
+  "height": 720,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"c59050e3-2a37-49fb-8056-6ebfbaaa3c5a","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c59050e3-2a37-49fb-8056-6ebfbaaa3c5a","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"LayerId":{"name":"454f3ae8-028c-4bca-8611-391b04f3213b","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"resourceVersion":"1.0","name":"c59050e3-2a37-49fb-8056-6ebfbaaa3c5a","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 1.0,
+    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"2140936d-ea4f-4395-b13d-04bdcba42148","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c59050e3-2a37-49fb-8056-6ebfbaaa3c5a","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
+    ],
+    "visibleRange": null,
+    "lockOrigin": false,
+    "showBackdrop": true,
+    "showBackdropImage": false,
+    "backdropImagePath": "",
+    "backdropImageOpacity": 0.5,
+    "backdropWidth": 1366,
+    "backdropHeight": 768,
+    "backdropXOffset": 0.0,
+    "backdropYOffset": 0.0,
+    "xorigin": 0,
+    "yorigin": 0,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},
+    "resourceVersion": "1.3",
+    "name": "spr_bg_sky",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"454f3ae8-028c-4bca-8611-391b04f3213b","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "stage",
+    "path": "folders/stage.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "spr_bg_sky",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
\ No newline at end of file
diff --git a/thpj3/sprites/spr_bg_stars/c8e746f3-7248-49f8-a1c3-0089cddf2095.png b/thpj3/sprites/spr_bg_stars/c8e746f3-7248-49f8-a1c3-0089cddf2095.png
new file mode 100644
index 0000000..ad8777f
Binary files /dev/null and b/thpj3/sprites/spr_bg_stars/c8e746f3-7248-49f8-a1c3-0089cddf2095.png differ
diff --git a/thpj3/sprites/spr_bg_stars/layers/c8e746f3-7248-49f8-a1c3-0089cddf2095/bb167ea3-800b-4b0e-920e-064572e9dd51.png b/thpj3/sprites/spr_bg_stars/layers/c8e746f3-7248-49f8-a1c3-0089cddf2095/bb167ea3-800b-4b0e-920e-064572e9dd51.png
new file mode 100644
index 0000000..ad8777f
Binary files /dev/null and b/thpj3/sprites/spr_bg_stars/layers/c8e746f3-7248-49f8-a1c3-0089cddf2095/bb167ea3-800b-4b0e-920e-064572e9dd51.png differ
diff --git a/thpj3/sprites/spr_bg_stars/spr_bg_stars.yy b/thpj3/sprites/spr_bg_stars/spr_bg_stars.yy
new file mode 100644
index 0000000..28b1e60
--- /dev/null
+++ b/thpj3/sprites/spr_bg_stars/spr_bg_stars.yy
@@ -0,0 +1,79 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 1,
+  "type": 0,
+  "origin": 0,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 71,
+  "bbox_right": 670,
+  "bbox_top": 27,
+  "bbox_bottom": 610,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 720,
+  "height": 720,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"c8e746f3-7248-49f8-a1c3-0089cddf2095","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c8e746f3-7248-49f8-a1c3-0089cddf2095","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"LayerId":{"name":"bb167ea3-800b-4b0e-920e-064572e9dd51","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"resourceVersion":"1.0","name":"c8e746f3-7248-49f8-a1c3-0089cddf2095","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 1.0,
+    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"1bbc2fdc-23e4-4400-ac2c-886f73d95d75","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c8e746f3-7248-49f8-a1c3-0089cddf2095","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+          ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
+    ],
+    "visibleRange": null,
+    "lockOrigin": false,
+    "showBackdrop": true,
+    "showBackdropImage": false,
+    "backdropImagePath": "",
+    "backdropImageOpacity": 0.5,
+    "backdropWidth": 1366,
+    "backdropHeight": 768,
+    "backdropXOffset": 0.0,
+    "backdropYOffset": 0.0,
+    "xorigin": 0,
+    "yorigin": 0,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},
+    "resourceVersion": "1.3",
+    "name": "spr_bg_stars",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"bb167ea3-800b-4b0e-920e-064572e9dd51","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "stage",
+    "path": "folders/stage.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "spr_bg_stars",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
\ No newline at end of file
diff --git a/thpj3/sprites/spr_bullet_test/spr_bullet_test.yy b/thpj3/sprites/spr_bullet_test/spr_bullet_test.yy
index 0cf9e40..37a35f9 100644
--- a/thpj3/sprites/spr_bullet_test/spr_bullet_test.yy
+++ b/thpj3/sprites/spr_bullet_test/spr_bullet_test.yy
@@ -77,8 +77,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_bullet_test",
diff --git a/thpj3/sprites/spr_fluff/spr_fluff.yy b/thpj3/sprites/spr_fluff/spr_fluff.yy
index 6f13cc5..549cba2 100644
--- a/thpj3/sprites/spr_fluff/spr_fluff.yy
+++ b/thpj3/sprites/spr_fluff/spr_fluff.yy
@@ -81,8 +81,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "enemies",
+    "path": "folders/enemies.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_fluff",
diff --git a/thpj3/sprites/spr_option_shot/spr_option_shot.yy b/thpj3/sprites/spr_option_shot/spr_option_shot.yy
index 7559b6d..576152a 100644
--- a/thpj3/sprites/spr_option_shot/spr_option_shot.yy
+++ b/thpj3/sprites/spr_option_shot/spr_option_shot.yy
@@ -69,8 +69,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_option_shot",
diff --git a/thpj3/sprites/spr_options/spr_options.yy b/thpj3/sprites/spr_options/spr_options.yy
index dd75d50..cc9be14 100644
--- a/thpj3/sprites/spr_options/spr_options.yy
+++ b/thpj3/sprites/spr_options/spr_options.yy
@@ -69,8 +69,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_options",
diff --git a/thpj3/sprites/spr_player_shot/spr_player_shot.yy b/thpj3/sprites/spr_player_shot/spr_player_shot.yy
index 874e43e..c4a02eb 100644
--- a/thpj3/sprites/spr_player_shot/spr_player_shot.yy
+++ b/thpj3/sprites/spr_player_shot/spr_player_shot.yy
@@ -69,8 +69,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_player_shot",
diff --git a/thpj3/sprites/spr_player_shot12/0db8d50d-5b50-4e61-95c9-9c4a7775f05d.png b/thpj3/sprites/spr_player_shot12/0db8d50d-5b50-4e61-95c9-9c4a7775f05d.png
deleted file mode 100644
index da11271..0000000
Binary files a/thpj3/sprites/spr_player_shot12/0db8d50d-5b50-4e61-95c9-9c4a7775f05d.png and /dev/null differ
diff --git a/thpj3/sprites/spr_player_shot12/layers/0db8d50d-5b50-4e61-95c9-9c4a7775f05d/74e04539-a659-429b-8758-3c93a2085793.png b/thpj3/sprites/spr_player_shot12/layers/0db8d50d-5b50-4e61-95c9-9c4a7775f05d/74e04539-a659-429b-8758-3c93a2085793.png
deleted file mode 100644
index da11271..0000000
Binary files a/thpj3/sprites/spr_player_shot12/layers/0db8d50d-5b50-4e61-95c9-9c4a7775f05d/74e04539-a659-429b-8758-3c93a2085793.png and /dev/null differ
diff --git a/thpj3/sprites/spr_wriggle/spr_wriggle.yy b/thpj3/sprites/spr_wriggle/spr_wriggle.yy
index 030a4e2..d4445a0 100644
--- a/thpj3/sprites/spr_wriggle/spr_wriggle.yy
+++ b/thpj3/sprites/spr_wriggle/spr_wriggle.yy
@@ -69,8 +69,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_wriggle",
diff --git a/thpj3/sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy b/thpj3/sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy
index be5d009..be64a50 100644
--- a/thpj3/sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy
+++ b/thpj3/sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy
@@ -69,8 +69,8 @@
   ],
   "nineSlice": null,
   "parent": {
-    "name": "thpj3",
-    "path": "thpj3.yyp",
+    "name": "player",
+    "path": "folders/player.yy",
   },
   "resourceVersion": "1.0",
   "name": "spr_wriggle_hitbox",
diff --git a/thpj3/thpj3.yyp b/thpj3/thpj3.yyp
index f250482..b0f0000 100644
--- a/thpj3/thpj3.yyp
+++ b/thpj3/thpj3.yyp
@@ -2,40 +2,45 @@
   "resources": [
     {"id":{"name":"fn_disclaimer","path":"fonts/fn_disclaimer/fn_disclaimer.yy",},"order":1,},
     {"id":{"name":"fn_title_text","path":"fonts/fn_title_text/fn_title_text.yy",},"order":0,},
-    {"id":{"name":"obj_options","path":"objects/obj_options/obj_options.yy",},"order":15,},
-    {"id":{"name":"spr_player_shot","path":"sprites/spr_player_shot/spr_player_shot.yy",},"order":18,},
+    {"id":{"name":"obj_options","path":"objects/obj_options/obj_options.yy",},"order":8,},
+    {"id":{"name":"spr_player_shot","path":"sprites/spr_player_shot/spr_player_shot.yy",},"order":1,},
+    {"id":{"name":"obj_stage_controller","path":"objects/obj_stage_controller/obj_stage_controller.yy",},"order":0,},
     {"id":{"name":"obj_disclaimer","path":"objects/obj_disclaimer/obj_disclaimer.yy",},"order":2,},
-    {"id":{"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"order":9,},
+    {"id":{"name":"spr_wriggle_hitbox","path":"sprites/spr_wriggle_hitbox/spr_wriggle_hitbox.yy",},"order":3,},
     {"id":{"name":"obj_title_moon","path":"objects/obj_title_moon/obj_title_moon.yy",},"order":1,},
-    {"id":{"name":"obj_option_shot","path":"objects/obj_option_shot/obj_option_shot.yy",},"order":21,},
+    {"id":{"name":"obj_option_shot","path":"objects/obj_option_shot/obj_option_shot.yy",},"order":7,},
     {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":7,},
-    {"id":{"name":"obj_bullet_test","path":"objects/obj_bullet_test/obj_bullet_test.yy",},"order":27,},
-    {"id":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"order":25,},
-    {"id":{"name":"scr_dialogue_start","path":"scripts/scr_dialogue_start/scr_dialogue_start.yy",},"order":10,},
+    {"id":{"name":"obj_bullet_test","path":"objects/obj_bullet_test/obj_bullet_test.yy",},"order":4,},
+    {"id":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"order":1,},
+    {"id":{"name":"scr_dialogue_start","path":"scripts/scr_dialogue_start/scr_dialogue_start.yy",},"order":3,},
     {"id":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},"order":3,},
-    {"id":{"name":"spr_options","path":"sprites/spr_options/spr_options.yy",},"order":16,},
+    {"id":{"name":"spr_options","path":"sprites/spr_options/spr_options.yy",},"order":4,},
     {"id":{"name":"obj_title_text","path":"objects/obj_title_text/obj_title_text.yy",},"order":3,},
-    {"id":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"order":11,},
+    {"id":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"order":5,},
     {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":5,},
-    {"id":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"order":14,},
-    {"id":{"name":"obj_enemy_bullet_parent","path":"objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy",},"order":26,},
-    {"id":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"order":24,},
-    {"id":{"name":"obj_player_shot","path":"objects/obj_player_shot/obj_player_shot.yy",},"order":17,},
-    {"id":{"name":"spr_option_shot","path":"sprites/spr_option_shot/spr_option_shot.yy",},"order":19,},
-    {"id":{"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"order":28,},
-    {"id":{"name":"Room3","path":"rooms/Room3/Room3.yy",},"order":6,},
+    {"id":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"order":2,},
+    {"id":{"name":"obj_enemy_bullet_parent","path":"objects/obj_enemy_bullet_parent/obj_enemy_bullet_parent.yy",},"order":5,},
+    {"id":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"order":3,},
+    {"id":{"name":"obj_player_shot","path":"objects/obj_player_shot/obj_player_shot.yy",},"order":6,},
+    {"id":{"name":"spr_option_shot","path":"sprites/spr_option_shot/spr_option_shot.yy",},"order":0,},
+    {"id":{"name":"spr_bullet_test","path":"sprites/spr_bullet_test/spr_bullet_test.yy",},"order":0,},
+    {"id":{"name":"spr_bg_ground","path":"sprites/spr_bg_ground/spr_bg_ground.yy",},"order":3,},
+    {"id":{"name":"rm_stage1","path":"rooms/rm_stage1/rm_stage1.yy",},"order":6,},
     {"id":{"name":"spr_title_title","path":"sprites/spr_title_title/spr_title_title.yy",},"order":8,},
+    {"id":{"name":"spr_bg_stars","path":"sprites/spr_bg_stars/spr_bg_stars.yy",},"order":5,},
+    {"id":{"name":"spr_bg_sky","path":"sprites/spr_bg_sky/spr_bg_sky.yy",},"order":4,},
     {"id":{"name":"scr_initialize","path":"scripts/scr_initialize/scr_initialize.yy",},"order":12,},
-    {"id":{"name":"spr_player_shot12","path":"sprites/spr_player_shot12/spr_player_shot12.yy",},"order":20,},
     {"id":{"name":"spr_text_arrow","path":"sprites/spr_text_arrow/spr_text_arrow.yy",},"order":1,},
     {"id":{"name":"fn_contact","path":"fonts/fn_contact/fn_contact.yy",},"order":0,},
     {"id":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":6,},
-    {"id":{"name":"obj_enemy_parent","path":"objects/obj_enemy_parent/obj_enemy_parent.yy",},"order":23,},
-    {"id":{"name":"fn_GUI","path":"fonts/fn_GUI/fn_GUI.yy",},"order":22,},
+    {"id":{"name":"obj_enemy_parent","path":"objects/obj_enemy_parent/obj_enemy_parent.yy",},"order":6,},
+    {"id":{"name":"spr_bg_forest","path":"sprites/spr_bg_forest/spr_bg_forest.yy",},"order":2,},
+    {"id":{"name":"fn_GUI","path":"fonts/fn_GUI/fn_GUI.yy",},"order":9,},
     {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":2,},
     {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":2,},
-    {"id":{"name":"scr_pattern_fire","path":"scripts/scr_pattern_fire/scr_pattern_fire.yy",},"order":29,},
+    {"id":{"name":"scr_pattern_fire","path":"scripts/scr_pattern_fire/scr_pattern_fire.yy",},"order":2,},
     {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":4,},
+    {"id":{"name":"tl_stage1_logic","path":"timelines/tl_stage1_logic/tl_stage1_logic.yy",},"order":1,},
     {"id":{"name":"obj_title_screen","path":"objects/obj_title_screen/obj_title_screen.yy",},"order":5,},
     {"id":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"order":0,},
     {"id":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},"order":0,},
@@ -56,12 +61,15 @@
   "RoomOrderNodes": [
     {"roomId":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},},
     {"roomId":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},},
-    {"roomId":{"name":"Room3","path":"rooms/Room3/Room3.yy",},},
+    {"roomId":{"name":"rm_stage1","path":"rooms/rm_stage1/rm_stage1.yy",},},
   ],
   "Folders": [
     {"folderPath":"folders/title.yy","order":2,"resourceVersion":"1.0","name":"title","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/disclaimer.yy","order":4,"resourceVersion":"1.0","name":"disclaimer","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/dialogue.yy","order":13,"resourceVersion":"1.0","name":"dialogue","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/player.yy","order":30,"resourceVersion":"1.0","name":"player","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/enemies.yy","order":31,"resourceVersion":"1.0","name":"enemies","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/stage.yy","order":32,"resourceVersion":"1.0","name":"stage","tags":[],"resourceType":"GMFolder",},
   ],
   "AudioGroups": [
     {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},
diff --git a/thpj3/timelines/tl_stage1_logic/moment_150.gml b/thpj3/timelines/tl_stage1_logic/moment_150.gml
new file mode 100644
index 0000000..8a95c8b
--- /dev/null
+++ b/thpj3/timelines/tl_stage1_logic/moment_150.gml
@@ -0,0 +1 @@
+scr_dialogue_start( "dialogue_test.txt" );
\ No newline at end of file
diff --git a/thpj3/timelines/tl_stage1_logic/moment_200.gml b/thpj3/timelines/tl_stage1_logic/moment_200.gml
new file mode 100644
index 0000000..5284b50
--- /dev/null
+++ b/thpj3/timelines/tl_stage1_logic/moment_200.gml
@@ -0,0 +1,10 @@
+/// @desc moemura is cute
+
+for ( var i = 0; i < 5; i++ ) {
+	var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_test );
+	with ( popcorn ) {
+		face_dir = LEFT;
+		speed = 2;
+		direction = 180;
+	}
+}
\ No newline at end of file
diff --git a/thpj3/timelines/tl_stage1_logic/moment_60.gml b/thpj3/timelines/tl_stage1_logic/moment_60.gml
new file mode 100644
index 0000000..5284b50
--- /dev/null
+++ b/thpj3/timelines/tl_stage1_logic/moment_60.gml
@@ -0,0 +1,10 @@
+/// @desc moemura is cute
+
+for ( var i = 0; i < 5; i++ ) {
+	var popcorn = instance_create_layer( 1280, 100 + 120 * i, "enemy", obj_enemy_test );
+	with ( popcorn ) {
+		face_dir = LEFT;
+		speed = 2;
+		direction = 180;
+	}
+}
\ No newline at end of file
diff --git a/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy b/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy
new file mode 100644
index 0000000..88c075e
--- /dev/null
+++ b/thpj3/timelines/tl_stage1_logic/tl_stage1_logic.yy
@@ -0,0 +1,15 @@
+{
+  "momentList": [
+    {"moment":60,"evnt":{"isDnD":false,"eventNum":60,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",},
+    {"moment":150,"evnt":{"isDnD":false,"eventNum":150,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",},
+    {"moment":200,"evnt":{"isDnD":false,"eventNum":200,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMMoment",},
+  ],
+  "parent": {
+    "name": "stage",
+    "path": "folders/stage.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "tl_stage1_logic",
+  "tags": [],
+  "resourceType": "GMTimeline",
+}
\ No newline at end of file