restructured build folders