restructured build using smash