Restructures & Fixes