More restructure
Fix build not building