diff --git a/model/1.3inch_lcd_cap/pisugar_case_lcd_cap.STL b/model/1.3inch_lcd_cap/pisugar_case_lcd_cap.STL
index deff196..e4443d0 100644
Binary files a/model/1.3inch_lcd_cap/pisugar_case_lcd_cap.STL and b/model/1.3inch_lcd_cap/pisugar_case_lcd_cap.STL differ
diff --git a/model/pisugar_case_camera_cap.SLDPRT b/model/pisugar_case_camera_cap.SLDPRT
index 87723fa..12f97c9 100644
Binary files a/model/pisugar_case_camera_cap.SLDPRT and b/model/pisugar_case_camera_cap.SLDPRT differ
diff --git a/model/pisugar_case_camera_cap.STL b/model/pisugar_case_camera_cap.STL
index 76a999f..81eadb9 100644
Binary files a/model/pisugar_case_camera_cap.STL and b/model/pisugar_case_camera_cap.STL differ
diff --git a/model/pisugar_case_common_cap.SLDPRT b/model/pisugar_case_common_cap.SLDPRT
index ed7b766..c96adbe 100755
Binary files a/model/pisugar_case_common_cap.SLDPRT and b/model/pisugar_case_common_cap.SLDPRT differ
diff --git a/model/pisugar_case_pin_cap.STL b/model/pisugar_case_pin_cap.STL
index bbcfcdd..5309ff5 100644
Binary files a/model/pisugar_case_pin_cap.STL and b/model/pisugar_case_pin_cap.STL differ
diff --git a/model/respeaker_shell/ReSpeaker 2-Mics Pi HAT.dae b/model/respeaker_cap/ReSpeaker 2-Mics Pi HAT.dae
similarity index 100%
rename from model/respeaker_shell/ReSpeaker 2-Mics Pi HAT.dae
rename to model/respeaker_cap/ReSpeaker 2-Mics Pi HAT.dae
diff --git a/model/respeaker_shell/ReSpeaker 2-Mics Pi HAT.skp b/model/respeaker_cap/ReSpeaker 2-Mics Pi HAT.skp
similarity index 100%
rename from model/respeaker_shell/ReSpeaker 2-Mics Pi HAT.skp
rename to model/respeaker_cap/ReSpeaker 2-Mics Pi HAT.skp
diff --git a/model/respeaker_shell/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_bottom_board.png b/model/respeaker_cap/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_bottom_board.png
similarity index 100%
rename from model/respeaker_shell/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_bottom_board.png
rename to model/respeaker_cap/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_bottom_board.png
diff --git a/model/respeaker_shell/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_top_board.png b/model/respeaker_cap/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_top_board.png
similarity index 100%
rename from model/respeaker_shell/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_top_board.png
rename to model/respeaker_cap/ReSpeaker 2-Mics Pi HAT/eagleUp_ReSpeaker_2-Mics_Pi_HAT_top_board.png
diff --git a/model/respeaker_cap/ReSpeaker_2-Mics_Pi_HAT.SLDPRT b/model/respeaker_cap/ReSpeaker_2-Mics_Pi_HAT.SLDPRT
new file mode 100644
index 0000000..1a0b88f
Binary files /dev/null and b/model/respeaker_cap/ReSpeaker_2-Mics_Pi_HAT.SLDPRT differ
diff --git a/model/respeaker_cap/comp_respeaker.SLDASM b/model/respeaker_cap/comp_respeaker.SLDASM
new file mode 100644
index 0000000..350e407
Binary files /dev/null and b/model/respeaker_cap/comp_respeaker.SLDASM differ
diff --git a/model/respeaker_cap/pisugar_respeaker_cap.SLDPRT b/model/respeaker_cap/pisugar_respeaker_cap.SLDPRT
new file mode 100644
index 0000000..cd75223
Binary files /dev/null and b/model/respeaker_cap/pisugar_respeaker_cap.SLDPRT differ
diff --git a/model/respeaker_cap/pisugar_respeaker_cap_button.SLDPRT b/model/respeaker_cap/pisugar_respeaker_cap_button.SLDPRT
new file mode 100644
index 0000000..c97ed22
Binary files /dev/null and b/model/respeaker_cap/pisugar_respeaker_cap_button.SLDPRT differ
diff --git a/model/respeaker_cap/pisugar_respeaker_print_comp.SLDPRT b/model/respeaker_cap/pisugar_respeaker_print_comp.SLDPRT
new file mode 100644
index 0000000..a4eb84f
Binary files /dev/null and b/model/respeaker_cap/pisugar_respeaker_print_comp.SLDPRT differ
diff --git a/model/respeaker_cap/pisugar_respeaker_print_comp.STL b/model/respeaker_cap/pisugar_respeaker_print_comp.STL
new file mode 100644
index 0000000..8ba0d06
Binary files /dev/null and b/model/respeaker_cap/pisugar_respeaker_print_comp.STL differ
diff --git a/model/respeaker_shell/ReSpeaker_2-Mics_Pi_HAT.SLDPRT b/model/respeaker_shell/ReSpeaker_2-Mics_Pi_HAT.SLDPRT
deleted file mode 100644
index 955dc82..0000000
Binary files a/model/respeaker_shell/ReSpeaker_2-Mics_Pi_HAT.SLDPRT and /dev/null differ
diff --git a/model/respeaker_shell/comp_respeaker.SLDASM b/model/respeaker_shell/comp_respeaker.SLDASM
deleted file mode 100644
index b8e5ee3..0000000
Binary files a/model/respeaker_shell/comp_respeaker.SLDASM and /dev/null differ
diff --git a/model/respeaker_shell/pisugar_respeaker_cap.SLDPRT b/model/respeaker_shell/pisugar_respeaker_cap.SLDPRT
deleted file mode 100644
index 055441d..0000000
Binary files a/model/respeaker_shell/pisugar_respeaker_cap.SLDPRT and /dev/null differ