Fixes to the restructure