diff --git a/resources/[defaultmaps]/fishing_shop/fxmanifest.lua b/resources/[defaultmaps]/fishing_shop/fxmanifest.lua
new file mode 100644
index 000000000..cf4b82143
--- /dev/null
+++ b/resources/[defaultmaps]/fishing_shop/fxmanifest.lua
@@ -0,0 +1,16 @@
+fx_version "bodacious"
+
+game 'gta5'
+
+this_is_a_map "yes"
+
+client_scripts {
+	"lib/common.lua"
+	, "lib/observers/interiorIdObserver.lua"
+	, "lib/observers/officeSafeDoorHandler.lua"
+	, "client.lua"
+
+	-- DLC Bikers
+	, "dlc_bikers/clubhouse3.lua"
+}
+
diff --git a/resources/[defaultmaps]/fishing_shop/stream/_manifest.ymf b/resources/[defaultmaps]/fishing_shop/stream/_manifest.ymf
new file mode 100644
index 000000000..d3a9e34db
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/_manifest.ymf differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/coke_machine_col.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/coke_machine_col.ybn
new file mode 100644
index 000000000..dea59dbb5
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/coke_machine_col.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/cs1_08_0.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/cs1_08_0.ybn
new file mode 100644
index 000000000..576611545
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/cs1_08_0.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/hei_cs1_08_0.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/hei_cs1_08_0.ybn
new file mode 100644
index 000000000..19c29f122
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/hei_cs1_08_0.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/hi@cs1_08_0.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/hi@cs1_08_0.ybn
new file mode 100644
index 000000000..f900d0884
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/hi@cs1_08_0.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/hi@hei_cs1_08_0.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/hi@hei_cs1_08_0.ybn
new file mode 100644
index 000000000..c56853981
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/hi@hei_cs1_08_0.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/huntingshop_building_col.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/huntingshop_building_col.ybn
new file mode 100644
index 000000000..da9233a65
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/huntingshop_building_col.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ybn/huntingshop_shell_col.ybn b/resources/[defaultmaps]/fishing_shop/stream/ybn/huntingshop_shell_col.ybn
new file mode 100644
index 000000000..87d7ef1fc
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ybn/huntingshop_shell_col.ybn differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/coke_machine.ydr b/resources/[defaultmaps]/fishing_shop/stream/ydr/coke_machine.ydr
new file mode 100644
index 000000000..928e9a807
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/coke_machine.ydr differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/cs1_08_pier02.ydr b/resources/[defaultmaps]/fishing_shop/stream/ydr/cs1_08_pier02.ydr
new file mode 100644
index 000000000..4ae3020b0
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/cs1_08_pier02.ydr differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop.ytd b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop.ytd
new file mode 100644
index 000000000..fe86ac487
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop.ytd differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_building.ydr b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_building.ydr
new file mode 100644
index 000000000..9b4c68cd7
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_building.ydr differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_building.ytd b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_building.ytd
new file mode 100644
index 000000000..9fc7a2460
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_building.ytd differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_shell.ydr b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_shell.ydr
new file mode 100644
index 000000000..e54dd9cd3
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/huntingshop_shell.ydr differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/v_ret_gc_bootdisp+hifr.ytd b/resources/[defaultmaps]/fishing_shop/stream/ydr/v_ret_gc_bootdisp+hifr.ytd
new file mode 100644
index 000000000..b030b6fae
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/v_ret_gc_bootdisp+hifr.ytd differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/v_ret_gc_bootdisp.yft b/resources/[defaultmaps]/fishing_shop/stream/ydr/v_ret_gc_bootdisp.yft
new file mode 100644
index 000000000..7ab4eb01f
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/v_ret_gc_bootdisp.yft differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ydr/vw_prop_casino_art_deer_01a.ydr b/resources/[defaultmaps]/fishing_shop/stream/ydr/vw_prop_casino_art_deer_01a.ydr
new file mode 100644
index 000000000..8036a1c54
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ydr/vw_prop_casino_art_deer_01a.ydr differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ymap/cs1_occl_00.ymap b/resources/[defaultmaps]/fishing_shop/stream/ymap/cs1_occl_00.ymap
new file mode 100644
index 000000000..916d706a1
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ymap/cs1_occl_00.ymap differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ymap/hei_cs1_08_strm_1.ymap b/resources/[defaultmaps]/fishing_shop/stream/ymap/hei_cs1_08_strm_1.ymap
new file mode 100644
index 000000000..35c5e8006
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ymap/hei_cs1_08_strm_1.ymap differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ymap/huntingshop_mlo.ymap b/resources/[defaultmaps]/fishing_shop/stream/ymap/huntingshop_mlo.ymap
new file mode 100644
index 000000000..d8d96fe0b
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ymap/huntingshop_mlo.ymap differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/ch_dlc_int_10_ch.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/ch_dlc_int_10_ch.ytyp
new file mode 100644
index 000000000..09cabe36c
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/ch_dlc_int_10_ch.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/huntingshop_building.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/huntingshop_building.ytyp
new file mode 100644
index 000000000..6a228b9e3
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/huntingshop_building.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/huntingshop_ytyp.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/huntingshop_ytyp.ytyp
new file mode 100644
index 000000000..cd56294a4
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/huntingshop_ytyp.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/int_medical.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/int_medical.ytyp
new file mode 100644
index 000000000..3c62b6558
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/int_medical.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/int_retail.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/int_retail.ytyp
new file mode 100644
index 000000000..c2fa51c58
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/int_retail.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/machine.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/machine.ytyp
new file mode 100644
index 000000000..6e3dc55fb
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/machine.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/v_int_61.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/v_int_61.ytyp
new file mode 100644
index 000000000..6ca0b1ba6
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/v_int_61.ytyp differ
diff --git a/resources/[defaultmaps]/fishing_shop/stream/ytyp/vw_prop_vw_casino_art_03.ytyp b/resources/[defaultmaps]/fishing_shop/stream/ytyp/vw_prop_vw_casino_art_03.ytyp
new file mode 100644
index 000000000..b4a56a73f
Binary files /dev/null and b/resources/[defaultmaps]/fishing_shop/stream/ytyp/vw_prop_vw_casino_art_03.ytyp differ