Build process updated and restructured