diff --git a/__init__.py b/src/__init__.py
similarity index 97%
rename from __init__.py
rename to src/__init__.py
index a4e4c14..95de1cb 100644
--- a/__init__.py
+++ b/src/__init__.py
@@ -8,7 +8,7 @@ from . panels.panel_info import BakeToIDInfoPanel
 from . properties.bake_to_id import BakeToIDProperties
 
 bl_info = {
-    "name": "Bake to ID Map",
+    "name": "Bake ID Mask",
     "author": "iedSoftworks",
     "description": "",
     "blender": (2, 80, 0),
diff --git a/operators/bake_to_id_map.py b/src/operators/bake_to_id_map.py
similarity index 99%
rename from operators/bake_to_id_map.py
rename to src/operators/bake_to_id_map.py
index 0781aed..378a897 100644
--- a/operators/bake_to_id_map.py
+++ b/src/operators/bake_to_id_map.py
@@ -6,7 +6,7 @@ import bpy
 
 class BakeToIDMapOperator(bpy.types.Operator):
     bl_idname = "object.bake_to_id_map"
-    bl_label = "Bake to ID Map"
+    bl_label = "Bake ID Mask"
 
     def execute(self, context):
 
diff --git a/panels/panel.py b/src/panels/panel.py
similarity index 100%
rename from panels/panel.py
rename to src/panels/panel.py
diff --git a/panels/panel_advanced.py b/src/panels/panel_advanced.py
similarity index 100%
rename from panels/panel_advanced.py
rename to src/panels/panel_advanced.py
diff --git a/panels/panel_info.py b/src/panels/panel_info.py
similarity index 100%
rename from panels/panel_info.py
rename to src/panels/panel_info.py
diff --git a/panels/panel_options.py b/src/panels/panel_options.py
similarity index 100%
rename from panels/panel_options.py
rename to src/panels/panel_options.py
diff --git a/properties/bake_to_id.py b/src/properties/bake_to_id.py
similarity index 100%
rename from properties/bake_to_id.py
rename to src/properties/bake_to_id.py