Restructure and Fixes