Restructure for extension build