Build process restructured
Build process restructured