- restructured build stuff