restructure for building