diff --git a/Assets/prefab/BadGuys.prefab b/Assets/Prefabs/BadGuys.prefab
similarity index 100%
rename from Assets/prefab/BadGuys.prefab
rename to Assets/Prefabs/BadGuys.prefab
diff --git a/Assets/Prefabs/Health Pickup.prefab b/Assets/Prefabs/Health Pickup.prefab
new file mode 100644
index 0000000..aa0d196
Binary files /dev/null and b/Assets/Prefabs/Health Pickup.prefab differ
diff --git a/Assets/prefab/MovingEnemy.prefab b/Assets/Prefabs/MovingEnemy.prefab
similarity index 100%
rename from Assets/prefab/MovingEnemy.prefab
rename to Assets/Prefabs/MovingEnemy.prefab
diff --git a/Assets/prefab/MovingPlateformeEnemy.prefab b/Assets/Prefabs/MovingPlateformeEnemy.prefab
similarity index 100%
rename from Assets/prefab/MovingPlateformeEnemy.prefab
rename to Assets/Prefabs/MovingPlateformeEnemy.prefab
diff --git a/Assets/prefab/Plateforme.prefab b/Assets/Prefabs/Plateforme.prefab
similarity index 100%
rename from Assets/prefab/Plateforme.prefab
rename to Assets/Prefabs/Plateforme.prefab
diff --git a/Assets/prefab/Player.prefab b/Assets/Prefabs/Player.prefab
similarity index 50%
rename from Assets/prefab/Player.prefab
rename to Assets/Prefabs/Player.prefab
index 9b20c93..851a2aa 100644
Binary files a/Assets/prefab/Player.prefab and b/Assets/Prefabs/Player.prefab differ
diff --git a/Assets/prefab/ball.prefab b/Assets/Prefabs/ball.prefab
similarity index 100%
rename from Assets/prefab/ball.prefab
rename to Assets/Prefabs/ball.prefab
diff --git a/Assets/prefab/touretEnnemy.prefab b/Assets/Prefabs/touretEnnemy.prefab
similarity index 100%
rename from Assets/prefab/touretEnnemy.prefab
rename to Assets/Prefabs/touretEnnemy.prefab
diff --git a/Assets/Script/Player Scripts/PlayerHealth.cs b/Assets/Script/Player Scripts/PlayerHealth.cs
index 7a57d61..966cb15 100644
--- a/Assets/Script/Player Scripts/PlayerHealth.cs	
+++ b/Assets/Script/Player Scripts/PlayerHealth.cs	
@@ -28,11 +28,14 @@ public class PlayerHealth : MonoBehaviour
 		anim = GetComponent <Animator> ();
 		playerAudio = GetComponent <AudioSource> ();
 		playerController = GetComponent <PlayerController> ();
-		//playerShooting = GetComponentInChildren <PlayerShooting> ();
-		
-		// Set the initial health of the player.
-		currentHealth = startingHealth;
-	}
+        //playerShooting = GetComponentInChildren <PlayerShooting> ();
+        healthSlider = GameObject.FindGameObjectWithTag("HealthSlider").GetComponent<Slider>();
+
+
+        // Set the initial health of the player.
+        currentHealth = startingHealth;
+        
+    }
 	
 	
 	void Update ()
@@ -42,14 +45,17 @@ public class PlayerHealth : MonoBehaviour
 	}
 
 
-    void OnTriggerEnter(Collider other)
+    void OnTriggerEnter2D(Collider2D other)
     {
         if (other.gameObject.CompareTag("HealthPickup"))
         {
             Debug.Log("Health Pickup");
             currentHealth = currentHealth + healthToRecoverOnPickup;
+            if (currentHealth > startingHealth)
+            {
+                currentHealth = startingHealth;
+            }
             healthSlider.value = currentHealth;
-            Destroy(other);
         }
     }
 
diff --git a/Assets/Spritesheets/Health Pickup Spritesheet.png b/Assets/Spritesheets/Health Pickup Spritesheet.png
new file mode 100644
index 0000000..7caa300
Binary files /dev/null and b/Assets/Spritesheets/Health Pickup Spritesheet.png differ
diff --git a/Assets/Mega_Man_3_NES_ScreenShot1.jpg b/Assets/Spritesheets/Mega_Man_3_NES_ScreenShot1.jpg
similarity index 100%
rename from Assets/Mega_Man_3_NES_ScreenShot1.jpg
rename to Assets/Spritesheets/Mega_Man_3_NES_ScreenShot1.jpg
diff --git a/Assets/mm.png b/Assets/Spritesheets/mm.png
similarity index 100%
rename from Assets/mm.png
rename to Assets/Spritesheets/mm.png
diff --git a/Assets/mm1cuttiles.gif b/Assets/Spritesheets/mm1cuttiles.gif
similarity index 100%
rename from Assets/mm1cuttiles.gif
rename to Assets/Spritesheets/mm1cuttiles.gif